From 00ec24d01361c416e4f6c5e7d2698d9912f82ee2 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 15 Apr 2009 21:56:57 +0000 Subject: [PATCH] Upgraded to APT 0.7. D apt_0.6.46.4-0.1.tar.gz A apt_0.7.20.2.tar.gz M cfnetwork.diff D dylib.diff A iconv.diff D mdns.diff A memrchr.c A memrchr.diff D ostable.diff M port.diff A textdomain.diff M timestamp.diff git-svn-id: http://svn.telesphoreo.org/trunk@589 514c082c-b64e-11dc-b46d-3d985efe055d --- .cvsignore | 4 - BUGS | 9 + COMPILING | 12 +- COPYING | 151 +- Makefile | 2 +- README.arch | 2 +- README.ddtp | 74 + README.make | 16 +- aclocal.m4 | 798 +++-- apt-inst/contrib/arfile.cc | 5 +- apt-inst/contrib/arfile.h | 3 - apt-inst/contrib/extracttar.cc | 9 +- apt-inst/contrib/extracttar.h | 4 - apt-inst/database.cc | 4 - apt-inst/database.h | 4 - apt-inst/deb/debfile.cc | 14 +- apt-inst/deb/debfile.h | 3 - apt-inst/deb/dpkgdb.cc | 4 - apt-inst/deb/dpkgdb.h | 3 - apt-inst/dirstream.cc | 4 - apt-inst/dirstream.h | 3 - apt-inst/extract.cc | 3 - apt-inst/extract.h | 4 +- apt-inst/filelist.cc | 4 - apt-inst/filelist.h | 4 +- apt-pkg/acquire-item.cc | 265 +- apt-pkg/acquire-item.h | 737 ++++- apt-pkg/acquire-method.cc | 12 +- apt-pkg/acquire-method.h | 13 +- apt-pkg/acquire-worker.cc | 30 +- apt-pkg/acquire-worker.h | 262 +- apt-pkg/acquire.cc | 29 +- apt-pkg/acquire.cc.orig | 890 +++++ apt-pkg/acquire.h | 550 +++- apt-pkg/algorithms.cc | 230 +- apt-pkg/algorithms.h | 7 +- apt-pkg/cachefile.cc | 7 +- apt-pkg/cachefile.h | 5 +- apt-pkg/cacheiterators.h | 87 +- apt-pkg/cdrom.cc | 78 +- apt-pkg/cdrom.h | 10 +- apt-pkg/clean.cc | 4 - apt-pkg/clean.h | 3 - apt-pkg/contrib/cdromutl.cc | 6 +- apt-pkg/contrib/cdromutl.h | 7 +- apt-pkg/contrib/cmndline.cc | 5 +- apt-pkg/contrib/cmndline.h | 6 +- apt-pkg/contrib/configuration.cc | 177 +- apt-pkg/contrib/configuration.h | 4 +- apt-pkg/contrib/crc-16.cc | 4 - apt-pkg/contrib/crc-16.h | 4 - apt-pkg/contrib/error.cc | 8 +- apt-pkg/contrib/error.h | 4 +- apt-pkg/contrib/fileutl.cc | 77 +- apt-pkg/contrib/fileutl.h | 4 +- apt-pkg/contrib/hashes.cc | 88 +- apt-pkg/contrib/hashes.h | 34 +- apt-pkg/contrib/md5.cc | 5 +- apt-pkg/contrib/md5.h | 4 +- apt-pkg/contrib/mmap.cc | 19 +- apt-pkg/contrib/mmap.h | 3 - apt-pkg/contrib/progress.cc | 4 +- apt-pkg/contrib/progress.h | 3 - apt-pkg/contrib/sha1.cc | 4 - apt-pkg/contrib/sha1.h | 5 +- apt-pkg/contrib/sha256.h | 5 +- apt-pkg/contrib/strutl.cc | 104 +- apt-pkg/contrib/strutl.h | 8 +- apt-pkg/deb/debindexfile.cc | 178 +- apt-pkg/deb/debindexfile.h | 34 +- apt-pkg/deb/deblistparser.cc | 48 + apt-pkg/deb/deblistparser.h | 4 + apt-pkg/deb/debmetaindex.cc | 34 +- apt-pkg/deb/debmetaindex.h | 4 - apt-pkg/deb/debrecords.cc | 72 +- apt-pkg/deb/debrecords.h | 9 +- apt-pkg/deb/debsrcrecords.cc | 8 +- apt-pkg/deb/debsrcrecords.h | 5 +- apt-pkg/deb/debsystem.cc | 4 - apt-pkg/deb/debsystem.h | 4 - apt-pkg/deb/debversion.cc | 3 - apt-pkg/deb/debversion.h | 4 +- apt-pkg/deb/dpkgpm.cc | 802 +++-- apt-pkg/deb/dpkgpm.cc.orig | 1142 +++++++ apt-pkg/deb/dpkgpm.h | 43 +- apt-pkg/depcache.cc | 675 +++- apt-pkg/depcache.h | 228 +- apt-pkg/indexcopy.cc | 198 +- apt-pkg/indexcopy.h | 13 + apt-pkg/indexfile.cc | 68 +- apt-pkg/indexfile.h | 10 +- apt-pkg/indexrecords.cc | 51 +- apt-pkg/indexrecords.h | 7 +- apt-pkg/init.cc | 28 +- apt-pkg/init.h | 6 +- apt-pkg/makefile | 4 +- apt-pkg/makefile.orig | 59 + apt-pkg/metaindex.h | 3 - apt-pkg/orderlist.cc | 22 +- apt-pkg/orderlist.h | 3 - apt-pkg/packagemanager.cc | 93 +- apt-pkg/packagemanager.h | 25 +- apt-pkg/pkgcache.cc | 51 +- apt-pkg/pkgcache.h | 56 +- apt-pkg/pkgcachegen.cc | 141 +- apt-pkg/pkgcachegen.h | 11 +- apt-pkg/pkgrecords.cc | 39 +- apt-pkg/pkgrecords.h | 13 +- apt-pkg/pkgsystem.cc | 5 +- apt-pkg/pkgsystem.h | 3 - apt-pkg/policy.cc | 12 +- apt-pkg/policy.h | 3 - apt-pkg/sourcelist.cc | 4 - apt-pkg/sourcelist.h | 3 - apt-pkg/srcrecords.cc | 4 - apt-pkg/srcrecords.h | 3 - apt-pkg/tagfile.cc | 5 +- apt-pkg/tagfile.h | 7 +- apt-pkg/vendor.cc | 4 - apt-pkg/vendor.h | 3 - apt-pkg/vendorlist.h | 3 - apt-pkg/version.cc | 4 - apt-pkg/version.h | 3 - apt-pkg/versionmatch.cc | 5 +- apt-pkg/versionmatch.h | 3 - buildlib/apti18n.h.in | 2 + buildlib/archtable | 29 - buildlib/config.guess | 679 ++-- buildlib/config.h.in | 7 +- buildlib/config.sub | 262 +- buildlib/copy.mak | 2 +- buildlib/debiandoc.mak | 2 +- buildlib/environment.mak.in | 21 +- buildlib/environment.mak.in.orig | 75 + buildlib/inttypes.h.in | 7 + buildlib/library.mak | 20 +- buildlib/ostable | 23 - buildlib/sizetable | 1 + cmdline/apt-cache.cc | 135 +- cmdline/apt-cache.cc.orig | 1826 ---------- cmdline/apt-cdrom.cc | 17 +- cmdline/apt-cdrom.cc.orig | 237 -- cmdline/apt-config.cc | 17 +- cmdline/apt-config.cc.orig | 148 - cmdline/apt-extracttemplates.cc | 19 +- cmdline/apt-extracttemplates.cc.orig | 406 --- cmdline/apt-get.cc | 572 ++-- cmdline/apt-get.cc.orig | 574 ++-- cmdline/apt-key | 93 +- cmdline/apt-mark | 65 + cmdline/apt-sortpkgs.cc | 19 +- cmdline/apt-sortpkgs.cc.orig | 221 -- cmdline/makefile | 18 +- configure | 914 ++++- configure.in | 39 +- debian/.cvsignore | 13 - debian/README.source | 6 + debian/apt-transport-https.README | 2 + debian/apt.conf.autoremove | 8 + debian/apt.cron.daily | 68 +- debian/apt.dirs | 4 + debian/apt.logrotate | 8 + debian/apt.manpages | 1 + debian/changelog | 991 +++++- debian/control | 23 +- debian/libapt-pkg-doc.doc-base.cache | 2 +- debian/libapt-pkg-doc.doc-base.dpkg-tech | 2 +- debian/libapt-pkg-doc.doc-base.files | 2 +- debian/libapt-pkg-doc.doc-base.method | 2 +- debian/postrm | 2 + debian/preinst | 2 + debian/prerm | 2 + debian/rules | 51 +- doc/.cvsignore | 14 - doc/Doxyfile.in | 1238 +++++++ doc/apt-cache.8 | 377 --- doc/apt-cache.8.xml | 17 +- doc/apt-cdrom.8 | 153 - doc/apt-config.8 | 108 - doc/apt-extracttemplates.1 | 92 - doc/apt-ftparchive.1 | 534 --- doc/apt-ftparchive.1.xml | 2 +- doc/apt-get.8 | 476 --- doc/apt-get.8.xml | 184 +- doc/apt-key.8 | 97 - doc/apt-key.8.xml | 45 + doc/apt-mark.8.xml | 114 + doc/apt-secure.8 | 137 - doc/apt-secure.8.xml | 6 +- doc/apt-sortpkgs.1 | 87 - doc/apt.8 | 13 +- doc/apt.conf.5 | 434 --- doc/apt.conf.5.xml | 426 ++- doc/apt.ent | 37 +- doc/apt_preferences.5 | 532 --- doc/apt_preferences.5.xml | 12 +- doc/cache.sgml | 5 +- doc/dpkg-tech.sgml | 2 + doc/es/.cvsignore | 14 - doc/es/apt-cache.es.8 | 2 +- doc/es/apt-cdrom.es.8 | 2 +- doc/es/apt-config.es.8 | 2 +- doc/es/apt-get.es.8 | 2 +- doc/es/apt.conf.es.5 | 2 +- doc/es/apt_preferences.es.5 | 2 +- doc/es/sources.list.es.5 | 2 +- doc/examples/apt-https-method-example.conf | 165 + doc/examples/configure-index | 49 +- doc/examples/sources.list | 2 +- doc/fr/.cvsignore | 13 - doc/fr/apt-cache.8 | 344 +- doc/fr/apt-cache.fr.8 | 344 +- doc/fr/apt-cdrom.8 | 126 +- doc/fr/apt-cdrom.fr.8 | 126 +- doc/fr/apt-config.8 | 76 +- doc/fr/apt-config.fr.8 | 76 +- doc/fr/apt-extracttemplates.1 | 74 +- doc/fr/apt-extracttemplates.fr.1 | 74 +- doc/fr/apt-ftparchive.1 | 412 +-- doc/fr/apt-ftparchive.fr.1 | 412 +-- doc/fr/apt-get.8 | 414 +-- doc/fr/apt-get.fr.8 | 414 +-- doc/fr/apt-key.8 | 82 +- doc/fr/apt-key.fr.8 | 82 +- doc/fr/apt-secure.8 | 149 +- doc/fr/apt-secure.fr.8 | 149 +- doc/fr/apt-secure.fr.8.xml | 2 +- doc/fr/apt-sortpkgs.1 | 64 +- doc/fr/apt-sortpkgs.fr.1 | 64 +- doc/fr/apt.conf.5 | 348 +- doc/fr/apt.conf.fr.5 | 348 +- doc/fr/apt.ent.fr | 4 +- doc/fr/apt_preferences.5 | 364 +- doc/fr/apt_preferences.fr.5 | 364 +- doc/fr/sources.list.5 | 190 +- doc/fr/sources.list.fr.5 | 190 +- doc/ja/apt-cache.8 | 178 +- doc/ja/apt-cache.ja.8 | 178 +- doc/ja/apt-cdrom.8 | 56 +- doc/ja/apt-cdrom.ja.8 | 56 +- doc/ja/apt-config.8 | 42 +- doc/ja/apt-config.ja.8 | 42 +- doc/ja/apt-extracttemplates.1 | 42 +- doc/ja/apt-extracttemplates.ja.1 | 42 +- doc/ja/apt-ftparchive.1 | 179 +- doc/ja/apt-ftparchive.ja.1 | 179 +- doc/ja/apt-get.8 | 156 +- doc/ja/apt-get.ja.8 | 156 +- doc/ja/apt-key.8 | 56 +- doc/ja/apt-key.ja.8 | 56 +- doc/ja/apt-secure.8 | 101 +- doc/ja/apt-secure.ja.8 | 101 +- doc/ja/apt-secure.ja.8.xml | 4 +- doc/ja/apt-sortpkgs.1 | 38 +- doc/ja/apt-sortpkgs.ja.1 | 38 +- doc/ja/apt.conf.5 | 130 +- doc/ja/apt.conf.ja.5 | 130 +- doc/ja/apt.ent.ja | 6 +- doc/ja/apt_preferences.5 | 199 +- doc/ja/apt_preferences.ja.5 | 199 +- doc/ja/sources.list.5 | 116 +- doc/ja/sources.list.ja.5 | 116 +- doc/makefile | 25 +- doc/offline.sgml | 20 +- doc/pl/makefile | 1 + doc/pl/offline.pl.sgml | 204 +- doc/pt_BR/.cvsignore | 3 - doc/pt_BR/apt_preferences.pt_BR.5 | 4 +- doc/sources.list.5 | 253 -- doc/sources.list.5.xml | 16 +- dselect/install | 3 +- dselect/makefile | 2 +- ftparchive/apt-ftparchive.cc | 22 +- ftparchive/apt-ftparchive.cc.orig | 977 ------ ftparchive/apt-ftparchive.h | 3 - ftparchive/cachedb.cc | 4 - ftparchive/cachedb.h | 4 +- ftparchive/contents.cc | 7 +- ftparchive/makefile | 2 +- ftparchive/multicompress.cc | 5 +- ftparchive/multicompress.h | 4 +- ftparchive/override.cc | 4 - ftparchive/override.h | 4 +- ftparchive/writer.cc | 5 +- ftparchive/writer.h | 3 - methods/cdrom.cc | 25 +- methods/connect.cc | 17 + methods/copy.cc | 18 +- methods/file.cc | 13 - methods/ftp.cc | 15 +- methods/gpgv.cc | 39 +- methods/gzip.cc | 13 - methods/http.cc | 31 +- methods/http.cc.orig | 1517 --------- methods/http.h | 4 +- methods/https.cc | 312 ++ methods/https.h | 48 + methods/makefile | 38 +- methods/rred.cc | 13 - methods/rsh.cc | 13 - po/ChangeLog | 598 ++++ po/LINGUAS | 2 +- po/apt-all.pot | 1144 ++++--- po/ar.po | 1184 ++++--- po/bg.po | 1239 ++++--- po/bs.po | 1158 ++++--- po/ca.po | 1442 ++++---- po/cs.po | 1324 ++++---- po/cy.po | 1201 ++++--- po/da.po | 1238 ++++--- po/de.po | 1711 +++++----- po/dz.po | 1224 ++++--- po/el.po | 1280 +++---- po/en_GB.po | 1216 ++++--- po/es.po | 1231 ++++--- po/eu.po | 1543 +++++---- po/fi.po | 1207 ++++--- po/fr.po | 2190 ++++++------ po/gl.po | 1256 +++---- po/he.po | 1165 ++++--- po/hu.po | 1236 ++++--- po/it.po | 1253 ++++--- po/ja.po | 1214 ++++--- po/km.po | 1220 ++++--- po/ko.po | 1540 +++++---- po/ku.po | 1398 ++++---- po/lt.po | 2813 ++++++++++++++++ po/makefile | 3 + po/mr.po | 2926 +++++++++++++++++ po/nb.po | 1272 +++---- po/ne.po | 1250 ++++--- po/nl.po | 1306 ++++---- po/nn.po | 1225 ++++--- po/pl.po | 2342 ++++++------- po/pt.po | 1888 ++++++----- po/pt_BR.po | 1714 +++++----- po/ro.po | 2103 ++++++------ po/ru.po | 1417 ++++---- po/sk.po | 1450 ++++---- po/sl.po | 1216 ++++--- po/sv.po | 2236 +++++++------ po/th.po | 2896 ++++++++++++++++ po/tl.po | 1277 +++---- po/uk.po | 1230 ++++--- po/vi.po | 1270 +++---- po/zh_CN.po | 1287 ++++---- po/zh_TW.po | 2267 +++++++------ share/lintian-overrides | 3 + test/fake-status | 16 + test/local-repo/Packages | 11 + test/local-repo/Packages.gz | Bin 0 -> 269 bytes test/local-repo/Packages.gz.save | Bin 0 -> 603 bytes test/local-repo/Release | 13 + test/local-repo/Release.gpg | 7 + test/local-repo/gdebi-test4.deb | Bin 0 -> 2306 bytes test/networkless-install-fixes/README | 5 + .../sources.test.list | 25 + test/networkless-install-fixes/test.sh | 25 + test/pre-upload-check.py | 154 + test/testkeys/mvo.key | 1182 +++++++ .../sources.list.all-gpg-broken | 2 + test/testsources.list/sources.list.all-gpg-ok | 2 + .../sources.list.all-release-broken | 1 + .../sources.list.all-release-ok | 1 + .../sources.list.md5-package-broken | 2 + .../sources.list.md5-package-ok | 2 + .../sources.list.md5-release-broken | 1 + .../sources.list.md5-release-ok | 1 + .../sources.list.sha1-release-broken | 1 + .../sources.list.sha1-release-ok | 1 + .../sources.list.sha256-package-broken | 2 + .../sources.list.sha256-package-ok | 2 + .../sources.list.sha256-release-broken | 1 + .../sources.list.sha256-release-ok | 1 + 374 files changed, 61156 insertions(+), 41954 deletions(-) delete mode 100644 .cvsignore create mode 100644 BUGS create mode 100644 README.ddtp create mode 100644 apt-pkg/acquire.cc.orig create mode 100644 apt-pkg/deb/dpkgpm.cc.orig create mode 100644 apt-pkg/makefile.orig delete mode 100644 buildlib/archtable create mode 100644 buildlib/environment.mak.in.orig delete mode 100644 buildlib/ostable delete mode 100644 cmdline/apt-cache.cc.orig delete mode 100644 cmdline/apt-cdrom.cc.orig delete mode 100644 cmdline/apt-config.cc.orig delete mode 100644 cmdline/apt-extracttemplates.cc.orig create mode 100755 cmdline/apt-mark delete mode 100644 cmdline/apt-sortpkgs.cc.orig delete mode 100644 debian/.cvsignore create mode 100644 debian/README.source create mode 100644 debian/apt-transport-https.README create mode 100644 debian/apt.conf.autoremove create mode 100644 debian/apt.logrotate delete mode 100644 doc/.cvsignore create mode 100644 doc/Doxyfile.in delete mode 100644 doc/apt-cache.8 delete mode 100644 doc/apt-cdrom.8 delete mode 100644 doc/apt-config.8 delete mode 100644 doc/apt-extracttemplates.1 delete mode 100644 doc/apt-ftparchive.1 delete mode 100644 doc/apt-get.8 delete mode 100644 doc/apt-key.8 create mode 100644 doc/apt-mark.8.xml delete mode 100644 doc/apt-secure.8 delete mode 100644 doc/apt-sortpkgs.1 delete mode 100644 doc/apt.conf.5 delete mode 100644 doc/apt_preferences.5 delete mode 100644 doc/es/.cvsignore create mode 100644 doc/examples/apt-https-method-example.conf delete mode 100644 doc/fr/.cvsignore delete mode 100644 doc/pt_BR/.cvsignore delete mode 100644 doc/sources.list.5 delete mode 100644 ftparchive/apt-ftparchive.cc.orig delete mode 100644 methods/http.cc.orig create mode 100644 methods/https.cc create mode 100644 methods/https.h create mode 100644 po/lt.po create mode 100644 po/mr.po create mode 100644 po/th.po create mode 100644 share/lintian-overrides create mode 100644 test/fake-status create mode 100644 test/local-repo/Packages create mode 100644 test/local-repo/Packages.gz create mode 100644 test/local-repo/Packages.gz.save create mode 100644 test/local-repo/Release create mode 100644 test/local-repo/Release.gpg create mode 100644 test/local-repo/gdebi-test4.deb create mode 100644 test/networkless-install-fixes/README create mode 100644 test/networkless-install-fixes/sources.test.list create mode 100755 test/networkless-install-fixes/test.sh create mode 100755 test/pre-upload-check.py create mode 100644 test/testkeys/mvo.key create mode 100644 test/testsources.list/sources.list.all-gpg-broken create mode 100644 test/testsources.list/sources.list.all-gpg-ok create mode 100644 test/testsources.list/sources.list.all-release-broken create mode 100644 test/testsources.list/sources.list.all-release-ok create mode 100644 test/testsources.list/sources.list.md5-package-broken create mode 100644 test/testsources.list/sources.list.md5-package-ok create mode 100644 test/testsources.list/sources.list.md5-release-broken create mode 100644 test/testsources.list/sources.list.md5-release-ok create mode 100644 test/testsources.list/sources.list.sha1-release-broken create mode 100644 test/testsources.list/sources.list.sha1-release-ok create mode 100644 test/testsources.list/sources.list.sha256-package-broken create mode 100644 test/testsources.list/sources.list.sha256-package-ok create mode 100644 test/testsources.list/sources.list.sha256-release-broken create mode 100644 test/testsources.list/sources.list.sha256-release-ok diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f9bbb82..0000000 --- a/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -autom4te.cache -aclocal.m4 -configure -build diff --git a/BUGS b/BUGS new file mode 100644 index 0000000..a7b6b11 --- /dev/null +++ b/BUGS @@ -0,0 +1,9 @@ + +DDTP problems: +-------------- +- apt-get update clean the /var/lib/apt/lists dir + from all Translation-$index that are not in the current + enviroment or Translations apt variable +- there needs to be a list of locales (pt, sv, en) that need + both language and country code to get the right file + (is in the code in indexfile::LanguageCode(), just a bit ugly diff --git a/COMPILING b/COMPILING index fadbe17..5ea5e52 100644 --- a/COMPILING +++ b/COMPILING @@ -9,14 +9,14 @@ To compile this you need a couple things g++ 2.8 works OK and newer egcs work well also. Nobody has tried it on other compilers :< You will need a properly working STL as well. - A C library with the usual POSIX functions and a BSD socket layer. - If you OS conforms to the Single Unix Spec then you are fine: + If your OS conforms to the Single Unix Spec then you are fine: http://www.opengroup.org/onlinepubs/7908799/index.html - Refer to the Build-Depends information in debian/control for additional requirements (some of which are Debian-specific) ** NOTICE ** The C++ global constructors do not link correctly when using non-shared -libaries. This is probably the correct behavior of the linker, but I have +libraries. This is probably the correct behavior of the linker, but I have not yet had time to devise a work around for it. The correct thing to do is add a reference to debSystem in apt-pkg/init.cc, assert(&debSystem == 0) would be fine for instance. @@ -29,7 +29,7 @@ I don't really care if your not-SUS OS doesn't work. It is simply too much work to maintain patches for dysfunctional OSs. I highly suggest you contact your vendor and express intrest in a conforming C library. -That said, there are lots of finniky problems that must be delt with even +That said, there are lots of finicky problems that must be dealt with even between the supported OS's. Primarily the path I choose to take is to put a shim header file in build/include that transparently adds the required functionality. Patches to make autoconf detect these cases and generate the @@ -39,12 +39,12 @@ Current shims: * C99 integer types 'inttypes.h' * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname. - The more adventerous could steal the KAME IPv6 enabled resolvers for those + The more adventurous could steal the KAME IPv6 enabled resolvers for those OS's with IPv6 support but no rfc2553 (why?) * define _XOPEN_EXTENDED_SOURCE to bring in h_errno on HP-UX * socklen_t shim in netdb.h if the OS does not have socklen_t -The only completely non-shimed OS is Linux with glibc2.1, glibc2.0 requires +The only completely non-shimmed OS is Linux with glibc2.1, glibc2.0 requires the first three shims. Platform Notes @@ -77,7 +77,7 @@ OpenBSD HP-UX HP-UX nyquist B.10.20 C 9000/780 2016574337 32-user license - Evil OS, does not conform very well to SUS - 1) snprintf exists but is not prototyped, ignore spurios warnings + 1) snprintf exists but is not prototyped, ignore spurious warnings 2) No socklen_t 3) Requires -D_XOPEN_SOURCE_EXTENDED for h_errno configure should fix the last two (see above) diff --git a/COPYING b/COPYING index 9e277e5..bba1b75 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 licened 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/Makefile b/Makefile index 2a88c1b..9f78ebf 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean # The startup target builds the necessary configure scripts. It should # be used after a CVS checkout. -CONVERTED=environment.mak include/config.h include/apti18n.h makefile +CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile include buildlib/configure.mak $(BUILDDIR)/include/config.h: buildlib/config.h.in $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in diff --git a/README.arch b/README.arch index 92870d6..364e940 100644 --- a/README.arch +++ b/README.arch @@ -1,7 +1,7 @@ You can build apt from arch, but this needs the following additional packages (in addtion to the usual build-depends): -xmlto perlsgml sgml2x sgmlspl docbook +autoconf automake xmlto perlsgml sgml2x sgmlspl docbook then run: diff --git a/README.ddtp b/README.ddtp new file mode 100644 index 0000000..98f6109 --- /dev/null +++ b/README.ddtp @@ -0,0 +1,74 @@ +TODO: +- URL-Remap for the translation files (to hack around the problem that + they are not on any ftp server yet but only on http://ddtp.debian.org/) + +Here is the original announcement of the ddtp support: + +* To: debian-devel-announce@lists.debian.org +* Subject: Translate files +* From: Michael Bramer +* Date: Sun, 6 Oct 2002 21:56:06 +0200 +* Mail-followup-to: debian-devel@lists.debian.org +* Message-id: <20021006195605.GA30516@home.debsupport.de> +* Old-return-path: +* User-agent: Mutt/1.3.28i + +Hello all + +After some discussion between Anthony Towns (a ftpmaster), Jason +Gunthorpe (APT Developer) and some DDTP Coordinators we find a way to +transfer the translated package descriptions from the archive to the +user. + +The translated descriptions need to be downloadable befor any +installation process, like the other package meta information. We +choose a new file per languages with all translated package +descriptions. The package system can download one or more of this +files at 'apt-get update' time and know the translations. + +The new files are names 'Translate-$lang' and the file have this +rfc822-format: + Package: <package-name> + Description-md5: <the md5 checksum of the english description> + Description-$lang.$encoding: <translated headline> + <translated section> + +The encoding of the Description is 'UTF-8' in all languages normal. +The files will be located at 'debian/dists/sid/main/i18n/' on the ftp +server (for all architecture). In addition of the plain +'Translate-$lang' file, there will be a 'gz' and a 'bz2' version and +in future also the new incremental format version. + +The <the md5 checksum of the english description> is the md5 checksum +of the full english description, without the 'Description: '-tag and +with all spaces and newlines. Look at this example: + Description: XXX + YYY + . + ZZZ +is md5("XXX\n YYY\n .\n ZZZ\n") (perl-syntax). + + +A future APT version will download one or some 'Translate-$lang' +file(s) at 'update'-time. After this download it show a translated +description instead of the english form, if it found a translated +description of the package with the right md5 chechsum. The enviroment +of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES, +etc). With this the package system will never show a outdated +translation. + +The translations come all from the DDTP. A daily process on +ddtp.debian.org make new 'Translated-$lang' files and a script on +ftp-master request this files and move this to the debian archive. +Now the first files are accessable at + http://ddtp.debian.org/pdesc/translatefiles/ + +If you found wrong translations, please read the guides on +ddtp.debian.org, make a better translation and send this per mail to +the DDTP server. Don't bug the package maintainer! + +Thanks +Grisu +-- +Michael Bramer - a Debian Linux Developer http://www.debsupport.de +PGP: finger grisu@db.debian.org -- Linux Sysadmin -- Use Debian Linux diff --git a/README.make b/README.make index c043f10..69d79d3 100644 --- a/README.make +++ b/README.make @@ -36,12 +36,12 @@ cd into it to edit your source code! The make system also performs dependency generation on the fly as the compiler runs. This is extremely fast and accurate. There is however -one failure condition that occures when a header file is erased. In +one failure condition that occurs when a header file is erased. In this case you should run make clean to purge the .o and .d files to rebuild. -The final significant deviation from normal make practicies is -in how the build directory is managed. It is not mearly a mirror of +The final significant deviation from normal make practices is +in how the build directory is managed. It is not nearly a mirror of the source directory but is logically divided in the following manner bin/ methods/ @@ -51,12 +51,12 @@ the source directory but is logically divided in the following manner apt-pkg/ obj/ apt-pkg/ - cmndline/ + cmdline/ [...] Only .o and .d files are placed in the obj/ subdirectory. The final compiled binaries are placed in bin, published headers for inter-component linking are placed in include/ and documentation is generated into doc/. This means -all runnable programs are within the bin/ directory, a huge benifit for +all runnable programs are within the bin/ directory, a huge benefit for debugging inter-program relationships. The .so files are also placed in bin/ for simplicity. @@ -87,9 +87,9 @@ Autoconf ~~~~~~~~ Straight out of CVS you have to initialize autoconf. This requires automake (I really don't know why) and autoconf and requires doing - aclocal -I buidlib + aclocal -I buildlib autoconf -[Altertatively you can run make startup in the top level build dir] +[Alternatively you can run make startup in the top level build dir] Autoconf is configured to do some basic system probes for optional and required functionality and generate an environment.mak and include/config.h @@ -103,7 +103,7 @@ build include/ dir and perhaps writing some replacement code and linking it in. To the fullest extent possible the source code should conform to standards and not cater to broken systems. -Autoconf will also wite a makefile into the top level of the build dir, +Autoconf will also write a makefile into the top level of the build dir, this simply acts as a wrapper to the main top level make in the source tree. There is one big warning, you can't use both this make file and the ones in the top level tree. Make is not able to resolve rules that diff --git a/aclocal.m4 b/aclocal.m4 index 0678b86..991457d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,8 +11,8 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# gettext.m4 serial 53 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# gettext.m4 serial 60 (gettext-0.17) +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,7 +28,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2005. +dnl Bruno Haible , 2000-2006. dnl Macro to add for using GNU gettext. @@ -76,8 +76,13 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_included_intl], + ifelse([$1], [external], + ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), + [yes])) define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ @@ -91,7 +96,7 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: @@ -117,6 +122,15 @@ AC_DEFUN([AM_GNU_GETTEXT], LTLIBINTL= POSUB= + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no @@ -135,26 +149,35 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif +changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_TRY_LINK([#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK @@ -165,48 +188,40 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, + [$gt_func_gnugettext_libintl], [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" ]) fi CPPFLAGS="$gt_save_CPPFLAGS" @@ -217,8 +232,8 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -278,7 +293,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -292,7 +307,7 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) @@ -360,291 +375,26 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], ]) -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], [ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([gl_VISIBILITY])dnl - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_LANGINFO_CODESET - gt_LC_MESSAGES - - dnl Compilation on mingw and Cygwin needs special Makefile rules, because - dnl 1. when we install a shared library, we must arrange to export - dnl auxiliary pointer variables for every exported variable, - dnl 2. when we install a shared library and a static library simultaneously, - dnl the include file specifies __declspec(dllimport) and therefore we - dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in - cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no - fi - WOE32DLL=$is_woe32dll - AC_SUBST([WOE32DLL]) - - dnl Rename some macros and functions used for locking. - AH_BOTTOM([ -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -]) + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) ]) -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], [ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_TRY_LINK( - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], - [], - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, - [Define to 1 if the compiler understands __builtin_expect.])]) - - AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - - AM_ICONV - - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, - dnl and a _NL_LOCALE_NAME macro always. - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, - [AC_TRY_LINK([#include -#include ], - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], - gt_cv_nl_locale_name=yes, - gt_cv_nl_locale_name=no) - ]) - if test $gt_cv_nl_locale_name = yes; then - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, - [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) ]) dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# iconv.m4 serial AM6 (gettext-0.17) +dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -666,6 +416,7 @@ AC_DEFUN([AM_ICONV_LINK], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. @@ -678,7 +429,7 @@ AC_DEFUN([AM_ICONV_LINK], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include @@ -701,7 +452,85 @@ AC_DEFUN([AM_ICONV_LINK], fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ + dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) @@ -745,6 +574,58 @@ size_t iconv(); fi ]) +# intlmacosx.m4 serial 1 (gettext-0.17) +dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + gt_cv_func_CFPreferencesCopyAppValue, + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # lib-ld.m4 serial 3 (gettext-0.13) dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -856,20 +737,22 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU ]) -# lib-link.m4 serial 8 (gettext-0.15) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. +# lib-link.m4 serial 13 (gettext-0.17) +dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.50) +AC_PREREQ(2.54) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -882,13 +765,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS], ac_cv_lib[]Name[]_libs="$LIB[]NAME" ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" ]) LIB[]NAME="$ac_cv_lib[]Name[]_libs" LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes @@ -904,6 +790,8 @@ dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) @@ -940,17 +828,23 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], CPPFLAGS="$ac_save_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= + LIB[]NAME[]_PREFIX= fi AC_SUBST([HAVE_LIB]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) undefine([Name]) undefine([NAME]) ]) dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ dnl Tell automake >= 1.10 to complain if config.rpath is missing. @@ -967,12 +861,14 @@ AC_DEFUN([AC_LIB_RPATH], acl_cv_rpath=done ]) wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. AC_ARG_ENABLE(rpath, [ --disable-rpath do not hardcode runtime library paths], @@ -982,20 +878,24 @@ AC_DEFUN([AC_LIB_RPATH], dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl Autoconf >= 2.61 supports dots in --with options. + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], [ if test "X$withval" = "Xno"; then use_additional=no @@ -1016,6 +916,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LIB[]NAME= LTLIB[]NAME= INC[]NAME= + LIB[]NAME[]_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -1055,22 +956,55 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIB[]NAME; do @@ -1078,21 +1012,46 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -1126,12 +1085,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then dnl Using DIR/libNAME.so during linking hardcodes DIR into the dnl resulting binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode DIR into the resulting dnl binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" @@ -1162,13 +1121,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH dnl here, because this doesn't fit in flags passed to the dnl compiler. So give up. No hardcoding. This affects only dnl very old systems. @@ -1195,6 +1154,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIB[]NAME[]_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -1356,18 +1316,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user must dnl pass all path elements in one option. We can arrange that for a dnl single library, but not when more than one $LIBNAMEs are used. alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else @@ -1375,7 +1335,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done @@ -1424,7 +1384,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) $1= if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode directories into the resulting dnl binary. rpathdirs= @@ -1458,16 +1418,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], done else dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user dnl must pass all path elements in one option. alldirs= for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="$flag" else @@ -1475,7 +1435,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], for dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done @@ -1705,8 +1665,8 @@ AC_DEFUN([AM_NLS], AC_SUBST(USE_NLS) ]) -# po.m4 serial 13 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# po.m4 serial 15 (gettext-0.17) +dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1734,6 +1694,10 @@ AC_DEFUN([AM_PO_SUBDIRS], AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake AC_REQUIRE([AM_NLS])dnl + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) + dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -1791,6 +1755,10 @@ changequote([,])dnl test -n "$localedir" || localedir='${datadir}/locale' AC_SUBST([localedir]) + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + AC_CONFIG_COMMANDS([po-directories], [[ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" @@ -2134,6 +2102,19 @@ EOF mv "$ac_file.tmp" "$ac_file" ]) +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. +AC_DEFUN([AM_XGETTEXT_OPTION_INIT], +[ + XGETTEXT_EXTRA_OPTIONS= +]) + +dnl Registers an option to be passed to xgettext in the po subdirectory. +AC_DEFUN([AM_XGETTEXT_OPTION], +[ + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" +]) + # progtest.m4 serial 4 (gettext-0.14.2) dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -2227,7 +2208,7 @@ fi AC_SUBST($1)dnl ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2235,59 +2216,22 @@ AC_SUBST($1)dnl # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) m4_include([buildlib/tools.m4]) diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 54d90bf..7c85f2e 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -14,9 +14,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/arfile.h" -#endif #include #include #include @@ -114,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/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 6c54d3e..96e18bc 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -15,9 +15,6 @@ #ifndef PKGLIB_ARFILE_H #define PKGLIB_ARFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/arfile.h" -#endif #include #include diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 062c06f..8338fd8 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -16,9 +16,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/extracttar.h" -#endif #include #include @@ -211,14 +208,14 @@ bool ExtractTar::Go(pkgDirStream &Stream) Itm.Name = (char *)LastLongName.c_str(); else { - Tar->Name[sizeof(Tar->Name)] = 0; + Tar->Name[sizeof(Tar->Name)-1] = 0; Itm.Name = Tar->Name; } if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0) Itm.Name += 2; // Grab the link target - Tar->Name[sizeof(Tar->LinkName)] = 0; + Tar->Name[sizeof(Tar->LinkName)-1] = 0; Itm.LinkTarget = Tar->LinkName; if (LastLongLink.empty() == false) @@ -335,7 +332,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) } // And finish up - if (Itm.Size != 0 && BadRecord == false) + if (Itm.Size >= 0 && BadRecord == false) if (Stream.FinishedFile(Itm,Fd) == false) return false; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 6daf00a..42f8ef5 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -14,10 +14,6 @@ #ifndef PKGLIB_EXTRACTTAR_H #define PKGLIB_EXTRACTTAR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extracttar.h" -#endif - #include #include diff --git a/apt-inst/database.cc b/apt-inst/database.cc index beee692..a5020f3 100644 --- a/apt-inst/database.cc +++ b/apt-inst/database.cc @@ -8,10 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/database.h" -#endif - #include /*}}}*/ diff --git a/apt-inst/database.h b/apt-inst/database.h index 0972d40..ef45bc2 100644 --- a/apt-inst/database.h +++ b/apt-inst/database.h @@ -21,10 +21,6 @@ #ifndef PKGLIB_DATABASE_H #define PKGLIB_DATABASE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/database.h" -#endif - #include #include diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 84906ff..cd7a888 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -16,10 +16,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debfile.h" -#endif - #include #include #include @@ -48,8 +44,10 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) return; } - if (!CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2")) { - _error->Error(_("This is not a valid DEB archive, it has no '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2"); + if (!CheckMember("data.tar.gz") && + !CheckMember("data.tar.bz2") && + !CheckMember("data.tar.lzma")) { + _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma"); return; } } @@ -134,6 +132,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) Member = AR.FindMember("data.tar.bz2"); Compressor = "bzip2"; } + if (Member == 0) { + Member = AR.FindMember("data.tar.lzma"); + Compressor = "lzma"; + } if (Member == 0) return _error->Error(_("Internal error, could not locate member")); if (File.Seek(Member->Start) == false) diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index d89b852..6b9f8ff 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -23,9 +23,6 @@ #ifndef PKGLIB_DEBFILE_H #define PKGLIB_DEBFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debfile.h" -#endif #include #include diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index 133acb8..9a5c7ba 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -13,10 +13,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/dpkgdb.h" -#endif - #include #include #include diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h index ddbb6d6..125845f 100644 --- a/apt-inst/deb/dpkgdb.h +++ b/apt-inst/deb/dpkgdb.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_DPKGDB_H #define PKGLIB_DPKGDB_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgdb.h" -#endif #include diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index 898ede3..586bbf7 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -11,10 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/dirstream.h" -#endif - #include #include diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index dfb480b..9d1af21 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -25,9 +25,6 @@ #ifndef PKGLIB_DIRSTREAM_H #define PKGLIB_DIRSTREAM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dirstream.h" -#endif class pkgDirStream { diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc index 2568ed9..85363b9 100644 --- a/apt-inst/extract.cc +++ b/apt-inst/extract.cc @@ -44,9 +44,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/extract.h" -#endif #include #include #include diff --git a/apt-inst/extract.h b/apt-inst/extract.h index a9152a2..7122298 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -17,9 +17,7 @@ #ifndef PKGLIB_EXTRACT_H #define PKGLIB_EXTRACT_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extract.h" -#endif + #include #include diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc index f14c641..060aa53 100644 --- a/apt-inst/filelist.cc +++ b/apt-inst/filelist.cc @@ -32,10 +32,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/filelist.h" -#endif - #include #include #include diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 7536a2f..c74a310 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -28,10 +28,8 @@ #ifndef PKGLIB_FILELIST_H #define PKGLIB_FILELIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/filelist.h" -#endif +#include #include class pkgFLCache diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 3e281a7..09ea5da 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -13,9 +13,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/acquire-item.h" -#endif #include #include #include @@ -98,7 +95,7 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size) // Acquire::Item::Done - Item downloaded OK /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcquire::Item::Done(string Message,unsigned long Size,string, +void pkgAcquire::Item::Done(string Message,unsigned long Size,string Hash, pkgAcquire::MethodConfig *Cnf) { // We just downloaded something.. @@ -136,7 +133,6 @@ void pkgAcquire::Item::Rename(string From,string To) /*}}}*/ - // AcqDiffIndex::AcqDiffIndex - Constructor // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe @@ -146,8 +142,9 @@ void pkgAcquire::Item::Rename(string From,string To) */ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5) - : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), Description(URIDesc) + HashString ExpectedHash) + : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), + Description(URIDesc) { Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); @@ -275,18 +272,18 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) if(found) { // queue the diffs - int last_space = Description.rfind(" "); - if(last_space != string::npos) - Description.erase(last_space, Description.size()-last_space); + string::size_type last_space = Description.rfind(" "); + if(last_space != string::npos) + Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedMD5, available_patches); + ExpectedHash, available_patches); Complete = false; Status = StatDone; Dequeue(); return true; } } - + // Nothing found, report and return false // Failing here is ok, if we return false later, the full // IndexFile is queued @@ -302,7 +299,7 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) << "Falling back to normal index file aquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedMD5); + ExpectedHash); Complete = false; Status = StatDone; @@ -348,8 +345,9 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, */ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, vector diffs) - : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), + HashString ExpectedHash, + vector diffs) + : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), available_patches(diffs) { @@ -382,7 +380,7 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl << "Falling back to normal index file aquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, - ExpectedMD5); + ExpectedHash); Finish(); } @@ -397,14 +395,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone) DestFile = _config->FindDir("Dir::State::lists"); DestFile += URItoFileName(RealURI); - // do the final md5sum checking - MD5Summation sum; - FileFd Fd(DestFile, FileFd::ReadOnly); - sum.AddFD(Fd.Fd(), Fd.Size()); - Fd.Close(); - string MD5 = (string)sum.Result(); - - if (!ExpectedMD5.empty() && MD5 != ExpectedMD5) + if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile)) { Status = StatAuthError; ErrorText = _("MD5Sum mismatch"); @@ -468,7 +459,6 @@ bool pkgAcqIndexDiffs::QueueNextDiff() // queue the right diff Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz"; Desc.Description = Description + " " + available_patches[0].file + string(".pdiff"); - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file); @@ -547,7 +537,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, // see if there is more to download if(available_patches.size() > 0) { new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedMD5, available_patches); + ExpectedHash, available_patches); return Finish(); } else return Finish(true); @@ -561,8 +551,8 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, instantiated to fetch the revision file */ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, string comprExt) - : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5) + HashString ExpectedHash, string comprExt) + : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash) { Decompression = false; Erase = false; @@ -578,9 +568,9 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, else CompressionExtension = ".gz"; } else { - CompressionExtension = comprExt; + CompressionExtension = (comprExt == "plain" ? "" : comprExt); } - Desc.URI = URI + CompressionExtension; + Desc.URI = URI + CompressionExtension; Desc.Description = URIDesc; Desc.Owner = this; @@ -607,20 +597,37 @@ string pkgAcqIndex::Custom600Headers() void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + bool descChanged = false; // no .bz2 found, retry with .gz if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { - Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; + Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; - // retry with a gzip one - new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, - ExpectedMD5, string(".gz")); + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + ExpectedHash, string(".gz")); + descChanged = true; + } + // no .gz found, retry with uncompressed + else if(Desc.URI.substr(Desc.URI.size()-2) == "gz") { + Desc.URI = Desc.URI.substr(0,Desc.URI.size()-2); + + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + ExpectedHash, string("plain")); + descChanged = true; + } + if (descChanged) { Status = StatDone; Complete = false; Dequeue(); return; } - + // on decompression failure, remove bad versions in partial/ + if(Decompression && Erase) { + string s = _config->FindDir("Dir::State::lists") + "partial/"; + s += URItoFileName(RealURI); + unlink(s.c_str()); + } + Item::Failed(Message,Cnf); } @@ -632,32 +639,23 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) to the uncompressed version of the file. If this is so the file is copied into the partial directory. In all other cases the file is decompressed with a gzip uri. */ -void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, +void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,MD5,Cfg); + Item::Done(Message,Size,Hash,Cfg); if (Decompression == true) { if (_config->FindB("Debug::pkgAcquire::Auth", false)) { - std::cerr << std::endl << RealURI << ": Computed MD5: " << MD5; - std::cerr << " Expected MD5: " << ExpectedMD5 << std::endl; + std::cerr << std::endl << RealURI << ": Computed Hash: " << Hash; + std::cerr << " Expected Hash: " << ExpectedHash.toStr() << std::endl; } - if (MD5.empty()) - { - MD5Summation sum; - FileFd Fd(DestFile, FileFd::ReadOnly); - sum.AddFD(Fd.Fd(), Fd.Size()); - Fd.Close(); - MD5 = (string)sum.Result(); - } - - if (!ExpectedMD5.empty() && MD5 != ExpectedMD5) + if (!ExpectedHash.empty() && ExpectedHash.toStr() != Hash) { Status = StatAuthError; - ErrorText = _("MD5Sum mismatch"); + ErrorText = _("Hash Sum mismatch"); Rename(DestFile,DestFile + ".FAILED"); return; } @@ -688,7 +686,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, // The files timestamp matches if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true) return; - Decompression = true; Local = true; DestFile += ".decomp"; @@ -714,12 +711,19 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, else Local = true; - string compExt = Desc.URI.substr(Desc.URI.size()-3); - char *decompProg; + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); + const char *decompProg; if(compExt == "bz2") decompProg = "bzip2"; - else if(compExt == ".gz") + else if(compExt == "gz") decompProg = "gzip"; + // flExtensions returns the full name if no extension is found + // this is why we have this complicated compare operation here + // FIMXE: add a new flJustExtension() that return "" if no + // extension is found and use that above so that it can + // be tested against "" + else if(compExt == flNotDir(URI(Desc.URI).Path)) + decompProg = "copy"; else { _error->Error("Unsupported extension: %s", compExt.c_str()); return; @@ -732,6 +736,35 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, Mode = decompProg; } +// AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* The Translation file is added to the queue */ +pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc) + : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "") +{ +} + + /*}}}*/ +// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if (Cnf->LocalOnly == true || + StringToBool(LookupTag(Message,"Transient-Failure"),false) == false) + { + // Ignore this + Status = StatDone; + Complete = false; + Dequeue(); + return; + } + + Item::Failed(Message,Cnf); +} + /*}}}*/ + pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, string MetaIndexURI, string MetaIndexURIDesc, @@ -745,8 +778,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); - // remove any partial downloaded sig-file. it may confuse proxies - // and is too small to warrant a partial download anyway + // remove any partial downloaded sig-file in partial/. + // it may confuse proxies and is too small to warrant a + // partial download anyway unlink(DestFile.c_str()); // Create the item @@ -754,16 +788,19 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, Desc.Owner = this; Desc.ShortDesc = ShortDesc; Desc.URI = URI; - string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); struct stat Buf; if (stat(Final.c_str(),&Buf) == 0) { - // File was already in place. It needs to be re-verified - // because Release might have changed, so Move it into partial - Rename(Final,DestFile); + // File was already in place. It needs to be re-downloaded/verified + // because Release might have changed, we do give it a differnt + // name than DestFile because otherwise the http method will + // send If-Range requests and there are too many broken servers + // out there that do not understand them + LastGoodSig = DestFile+".reverify"; + Rename(Final,LastGoodSig); } QueueURI(Desc); @@ -775,7 +812,7 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, string pkgAcqMetaSig::Custom600Headers() { struct stat Buf; - if (stat(DestFile.c_str(),&Buf) != 0) + if (stat(LastGoodSig.c_str(),&Buf) != 0) return "\nIndex-File: true"; return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); @@ -805,6 +842,12 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, Complete = true; + // put the last known good file back on i-m-s hit (it will + // be re-verified again) + // Else do nothing, we have the new file in DestFile then + if(StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) + Rename(LastGoodSig, DestFile); + // queue a pkgAcqMetaIndex to be verified against the sig we just retrieved new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, DestFile, IndexTargets, MetaIndexParser); @@ -813,17 +856,22 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); // if we get a network error we fail gracefully - if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure" || - LookupTag(Message,"FailReason") == "ConnectionRefused") { + if(Status == StatTransientNetworkError) + { Item::Failed(Message,Cnf); + // move the sigfile back on transient network failures + if(FileExists(DestFile)) + Rename(LastGoodSig,Final); + + // set the status back to , Item::Failed likes to reset it + Status = pkgAcquire::Item::StatTransientNetworkError; return; } // Delete any existing sigfile when the acquire failed - string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); unlink(Final.c_str()); // queue a pkgAcqMetaIndex with no sigfile @@ -848,8 +896,8 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, string SigFile, const vector* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false), - MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false) + Item(Owner), RealURI(URI), SigFile(SigFile), IndexTargets(IndexTargets), + MetaIndexParser(MetaIndexParser), AuthPass(false), IMSHit(false) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -879,10 +927,10 @@ string pkgAcqMetaIndex::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } -void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string MD5, +void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,MD5,Cfg); + Item::Done(Message,Size,Hash,Cfg); // MetaIndexes are done in two passes: one to download the // metaindex with an appropriate method, and a second to verify it @@ -944,18 +992,18 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) // see if the download was a IMSHit IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false); - Complete = true; string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); - // The files timestamp matches - if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == false) - { - // Move it into position + // If we get a IMS hit we can remove the empty file in partial + // othersie we move the file in place + if (IMSHit) + unlink(DestFile.c_str()); + else Rename(DestFile,FinalFile); - } + chmod(FinalFile.c_str(),0644); DestFile = FinalFile; } @@ -1000,7 +1048,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) Target != IndexTargets->end(); Target++) { - string ExpectedIndexMD5; + HashString ExpectedIndexHash; if (verify) { const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey); @@ -1011,16 +1059,16 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) + (*Target)->MetaKey + " in Meta-index file (malformed Release file?)"; return; } - ExpectedIndexMD5 = Record->MD5Hash; + ExpectedIndexHash = Record->Hash; if (_config->FindB("Debug::pkgAcquire::Auth", false)) { std::cerr << "Queueing: " << (*Target)->URI << std::endl; - std::cerr << "Expected MD5: " << ExpectedIndexMD5 << std::endl; + std::cerr << "Expected Hash: " << ExpectedIndexHash.toStr() << std::endl; } - if (ExpectedIndexMD5.empty()) + if (ExpectedIndexHash.empty()) { Status = StatAuthError; - ErrorText = "Unable to find MD5 sum for " + ErrorText = "Unable to find hash sum for " + (*Target)->MetaKey + " in Meta-index file"; return; } @@ -1030,10 +1078,10 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) // on the users option) if(_config->FindB("Acquire::PDiffs",true) == true) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + (*Target)->ShortDesc, ExpectedIndexHash); else new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + (*Target)->ShortDesc, ExpectedIndexHash); } } @@ -1273,7 +1321,12 @@ bool pkgAcqArchive::QueueNext() return false; string PkgFile = Parse.FileName(); - MD5 = Parse.MD5Hash(); + if(Parse.SHA256Hash() != "") + ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); + else if (Parse.SHA1Hash() != "") + ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); if (PkgFile.empty() == true) return _error->Error(_("The package index files are corrupted. No Filename: " "field for package %s."), @@ -1353,10 +1406,10 @@ bool pkgAcqArchive::QueueNext() // AcqArchive::Done - Finished fetching /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash, +void pkgAcqArchive::Done(string Message,unsigned long Size,string CalcHash, pkgAcquire::MethodConfig *Cfg) { - Item::Done(Message,Size,Md5Hash,Cfg); + Item::Done(Message,Size,CalcHash,Cfg); // Check the size if (Size != Version->Size) @@ -1366,17 +1419,14 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash, return; } - // Check the md5 - if (Md5Hash.empty() == false && MD5.empty() == false) + // Check the hash + if(ExpectedHash.toStr() != CalcHash) { - if (Md5Hash != MD5) - { - Status = StatError; - ErrorText = _("MD5Sum mismatch"); - if(FileExists(DestFile)) - Rename(DestFile,DestFile + ".FAILED"); - return; - } + Status = StatError; + ErrorText = _("Hash Sum mismatch"); + if(FileExists(DestFile)) + Rename(DestFile,DestFile + ".FAILED"); + return; } // Grab the output filename @@ -1468,10 +1518,10 @@ void pkgAcqArchive::Finished() // AcqFile::pkgAcqFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The file is added to the queue */ -pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, +pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, unsigned long Size,string Dsc,string ShortDesc, const string &DestDir, const string &DestFilename) : - Item(Owner), Md5Hash(MD5) + Item(Owner), ExpectedHash(Hash) { Retries = _config->FindI("Acquire::Retries",0); @@ -1508,23 +1558,20 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, // AcqFile::Done - Item downloaded OK /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcqFile::Done(string Message,unsigned long Size,string MD5, +void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash, pkgAcquire::MethodConfig *Cnf) { - // Check the md5 - if (Md5Hash.empty() == false && MD5.empty() == false) + Item::Done(Message,Size,CalcHash,Cnf); + + // Check the hash + if(!ExpectedHash.empty() && ExpectedHash.toStr() != CalcHash) { - if (Md5Hash != MD5) - { - Status = StatError; - ErrorText = "MD5Sum mismatch"; - Rename(DestFile,DestFile + ".FAILED"); - return; - } + Status = StatError; + ErrorText = "Hash Sum mismatch"; + Rename(DestFile,DestFile + ".FAILED"); + return; } - Item::Done(Message,Size,MD5,Cnf); - string FileName = LookupTag(Message,"Filename"); if (FileName.empty() == true) { diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 3649d7a..a48f7f7 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -9,10 +9,10 @@ the Owner Acquire class. Derived classes will then call QueueURI to register all the URI's they wish to fetch at the initial moment. - Two item classes are provided to provide functionality for downloading - of Index files and downloading of Packages. + Three item classes are provided to provide functionality for + downloading of Index, Translation and Packages files. - A Archive class is provided for downloading .deb files. It does Md5 + A Archive class is provided for downloading .deb files. It does Hash checking and source location as well as a retry algorithm. ##################################################################### */ @@ -26,78 +26,290 @@ #include #include #include - -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-item.h" -#endif - -// Item to acquire +#include + +/** \addtogroup acquire + * @{ + * + * \file acquire-item.h + */ + +/** \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 + * acquire queue when they are created by calling QueueURI(), and + * remove themselves by calling Dequeue() when either Done() or + * Failed() is invoked. Item objects are also responsible for + * notifying the download progress indicator (accessible via + * #Owner->Log) of their status. + * + * \see pkgAcquire + */ class pkgAcquire::Item { protected: - // Some private helper methods for registering URIs + /** \brief The acquire object with which this item is associated. */ pkgAcquire *Owner; + + /** \brief Insert this item into its owner's queue. + * + * \param ItemDesc Metadata about this item (its URI and + * description). + */ inline void QueueURI(ItemDesc &Item) {Owner->Enqueue(Item);}; + + /** \brief Remove this item from its owner's queue. */ inline void Dequeue() {Owner->Dequeue(this);}; - // Safe rename function with timestamp preservation + /** \brief Rename a file without modifying its timestamp. + * + * Many item methods call this as their final action. + * + * \param From The file to be renamed. + * + * \param To The new name of #From. If #To exists it will be + * overwritten. + */ void Rename(string From,string To); public: - // State of the item - enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status; + /** \brief The current status of this item. */ + enum ItemState + { + /** \brief The item is waiting to be downloaded. */ + StatIdle, + + /** \brief The item is currently being downloaded. */ + StatFetching, + + /** \brief The item has been successfully downloaded. */ + StatDone, + + /** \brief An error was encountered while downloading this + * item. + */ + StatError, + + /** \brief The item was downloaded but its authenticity could + * not be verified. + */ + StatAuthError, + + /** \brief The item was could not be downloaded because of + * a transient network error (e.g. network down) + */ + StatTransientNetworkError + } Status; + + /** \brief Contains a textual description of the error encountered + * if #Status is #StatError or #StatAuthError. + */ string ErrorText; + + /** \brief The size of the object to fetch. */ unsigned long FileSize; - unsigned long PartialSize; + + /** \brief How much of the object was already fetched. */ + unsigned long PartialSize; + + /** \brief If not \b NULL, contains the name of a subprocess that + * is operating on this object (for instance, "gzip" or "gpgv"). + */ const char *Mode; + + /** \brief A client-supplied unique identifier. + * + * This field is initalized to 0; it is meant to be filled in by + * clients that wish to use it to uniquely identify items. + * + * \todo it's unused in apt itself + */ unsigned long ID; + + /** \brief If \b true, the entire object has been successfully fetched. + * + * Subclasses should set this to \b true when appropriate. + */ bool Complete; + + /** \brief If \b true, the URI of this object is "local". + * + * The only effect of this field is to exclude the object from the + * download progress indicator's overall statistics. + */ bool Local; - // Number of queues we are inserted into + /** \brief The number of fetch queues into which this item has been + * inserted. + * + * There is one queue for each source from which an item could be + * downloaded. + * + * \sa pkgAcquire + */ unsigned int QueueCounter; - // File to write the fetch into + /** \brief The name of the file into which the retrieved object + * will be written. + */ string DestFile; - // Action members invoked by the worker + /** \brief Invoked by the acquire worker when the object couldn't + * be fetched. + * + * This is a branch of the continuation of the fetch process. + * + * \param Message An RFC822-formatted message from the acquire + * method describing what went wrong. Use LookupTag() to parse + * it. + * + * \param Cnf The method via which the worker tried to fetch this object. + * + * \sa pkgAcqMethod + */ virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(string Message,unsigned long Size,string Md5Hash, + + /** \brief Invoked by the acquire worker when the object was + * fetched successfully. + * + * Note that the object might \e not have been written to + * DestFile; check for the presence of an Alt-Filename entry in + * Message to find the file to which it was really written. + * + * Done is often used to switch from one stage of the processing + * to the next (e.g. fetching, unpacking, copying). It is one + * branch of the continuation of the fetch process. + * + * \param Message Data from the acquire method. Use LookupTag() + * to parse it. + * \param Size The size of the object that was fetched. + * \param Hash The HashSum of the object that was fetched. + * \param Cnf The method via which the object was fetched. + * + * \sa pkgAcqMethod + */ + virtual void Done(string Message,unsigned long Size,string Hash, pkgAcquire::MethodConfig *Cnf); + + /** \brief Invoked when the worker starts to fetch this object. + * + * \param Message RFC822-formatted data from the worker process. + * Use LookupTag() to parse it. + * + * \param Size The size of the object being fetched. + * + * \sa pkgAcqMethod + */ virtual void Start(string Message,unsigned long Size); + + /** \brief Custom headers to be sent to the fetch process. + * + * \return a string containing RFC822-style headers that are to be + * inserted into the 600 URI Acquire message sent to the fetch + * subprocess. The headers are inserted after a newline-less + * line, so they should (if nonempty) have a leading newline and + * no trailing newline. + */ virtual string Custom600Headers() {return string();}; + + /** \brief A "descriptive" URI-like string. + * + * \return a URI that should be used to describe what is being fetched. + */ virtual string DescURI() = 0; + /** \brief Short item description. + * + * \return a brief description of the object being fetched. + */ virtual string ShortDesc() {return DescURI();} + + /** \brief Invoked by the worker when the download is completely done. */ virtual void Finished() {}; - // Inquire functions - virtual string MD5Sum() {return string();}; + /** \brief HashSum + * + * \return the HashSum of this object, if applicable; otherwise, an + * empty string. + */ + virtual string HashSum() {return string();}; + + /** \return the acquire process with which this item is associated. */ pkgAcquire *GetOwner() {return Owner;}; + + /** \return \b true if this object is being fetched from a trusted source. */ virtual bool IsTrusted() {return false;}; - + + /** \brief Initialize an item. + * + * Adds the item to the list of items known to the acquire + * process, but does not place it into any fetch queues (you must + * manually invoke QueueURI() to do so). + * + * Initializes all fields of the item other than Owner to 0, + * false, or the empty string. + * + * \param Owner The new owner of this item. + */ Item(pkgAcquire *Owner); + + /** \brief Remove this item from its owner's queue by invoking + * pkgAcquire::Remove. + */ virtual ~Item(); }; -// item for index diffs - +/** \brief Information about an index patch (aka diff). */ struct DiffInfo { + /** The filename of the diff. */ string file; + + /** The sha1 hash of the diff. */ string sha1; + + /** The size of the diff. */ unsigned long size; }; +/** \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 + * additional downloads of either the individual patches (using + * pkgAcqIndexDiffs) or the entire Packages file (using pkgAcqIndex). + * + * \sa pkgAcqIndexDiffs, pkgAcqIndex + */ class pkgAcqDiffIndex : public pkgAcquire::Item { protected: + /** \brief If \b true, debugging information will be written to std::clog. */ bool Debug; + + /** \brief The item that is currently being downloaded. */ pkgAcquire::ItemDesc Desc; + + /** \brief The URI of the index file to recreate at our end (either + * by downloading it or by applying partial patches). + */ string RealURI; - string ExpectedMD5; + + /** \brief The Hash that the real index file should have after + * all patches have been applied. + */ + HashString ExpectedHash; + + /** \brief The index file which will be patched to generate the new + * file. + */ string CurrentPackagesFile; + + /** \brief A description of the Packages file (stored in + * pkgAcquire::ItemDesc::Description). + */ string Description; public: @@ -108,54 +320,199 @@ class pkgAcqDiffIndex : public pkgAcquire::Item virtual string DescURI() {return RealURI + "Index";}; virtual string Custom600Headers(); - // helpers + /** \brief Parse the Index file for a set of Packages diffs. + * + * Parses the Index file and creates additional download items as + * necessary. + * + * \param IndexDiffFile The name of the Index file. + * + * \return \b true if the Index file was successfully parsed, \b + * false otherwise. + */ bool ParseDiffIndex(string IndexDiffFile); + + /** \brief Create a new pkgAcqDiffIndex. + * + * \param Owner The Acquire object that owns this item. + * + * \param URI The URI of the list file to download. + * + * \param URIDesc A long description of the list file to download. + * + * \param ShortDesc A short description of the list file to download. + * + * \param ExpectedHash The list file's MD5 signature. + */ pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct, string ExpectedMD5); + string ShortDesc, HashString ExpectedHash); }; +/** \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 + * enqueue a new pkgAcqIndexDiffs to download and apply the remaining + * patches. If no patch can be found that applies to an intermediate + * file or if one of the patches cannot be downloaded, falls back to + * downloading the entire package index file using pkgAcqIndex. + * + * \sa pkgAcqDiffIndex, pkgAcqIndex + */ class pkgAcqIndexDiffs : public pkgAcquire::Item { + private: + + /** \brief Queue up the next diff download. + * + * Search for the next available diff that applies to the file + * that currently exists on disk, and enqueue it by calling + * QueueURI(). + * + * \return \b true if an applicable diff was found, \b false + * otherwise. + */ + bool QueueNextDiff(); + + /** \brief Handle tasks that must be performed after the item + * finishes downloading. + * + * Dequeues the item and checks the resulting file's md5sum + * against ExpectedHash after the last patch was applied. + * There is no need to check the md5/sha1 after a "normal" + * patch because QueueNextDiff() will check the sha1 later. + * + * \param allDone If \b true, the file was entirely reconstructed, + * and its md5sum is verified. + */ + void Finish(bool allDone=false); + protected: + + /** \brief If \b true, debugging output will be written to + * std::clog. + */ bool Debug; + + /** \brief A description of the item that is currently being + * downloaded. + */ pkgAcquire::ItemDesc Desc; + + /** \brief The URI of the package index file that is being + * reconstructed. + */ string RealURI; - string ExpectedMD5; - // this is the SHA-1 sum we expect after the patching + /** \brief The HashSum of the package index file that is being + * reconstructed. + */ + HashString ExpectedHash; + + /** A description of the file being downloaded. */ string Description; + + /** The patches that remain to be downloaded, including the patch + * being downloaded right now. This list should be ordered so + * that each diff appears before any diff that depends on it. + * + * \todo These are indexed by sha1sum; why not use some sort of + * dictionary instead of relying on ordering and stripping them + * off the front? + */ vector available_patches; - enum {StateFetchIndex,StateFetchDiff,StateUnzipDiff,StateApplyDiff} State; + /** The current status of this patch. */ + enum DiffState + { + /** \brief The diff is in an unknown state. */ + StateFetchUnkown, + + /** \brief The diff is currently being fetched. */ + StateFetchDiff, + + /** \brief The diff is currently being uncompressed. */ + StateUnzipDiff, + + /** \brief The diff is currently being applied. */ + StateApplyDiff + } State; public: - // Specialized action members + /** \brief Called when the patch file failed to be downloaded. + * + * This method will fall back to downloading the whole index file + * outright; its arguments are ignored. + */ virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); virtual string DescURI() {return RealURI + "Index";}; - // various helpers - bool QueueNextDiff(); - bool ApplyDiff(string PatchFile); - void Finish(bool allDone=false); - + /** \brief Create an index diff item. + * + * After filling in its basic fields, this invokes Finish(true) if + * #diffs is empty, or QueueNextDiff() otherwise. + * + * \param Owner The pkgAcquire object that owns this item. + * + * \param URI The URI of the package index file being + * reconstructed. + * + * \param URIDesc A long description of this item. + * + * \param ShortDesc A brief description of this item. + * + * \param ExpectedHash The expected md5sum of the completely + * reconstructed package index file; the index file will be tested + * against this value when it is entirely reconstructed. + * + * \param diffs The remaining diffs from the index of diffs. They + * should be ordered so that each diff appears before any diff + * that depends on it. + */ pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct, string ExpectedMD5, + string ShortDesc, HashString ExpectedHash, vector diffs=vector()); }; -// Item class for index files +/** \brief An acquire item that is responsible for fetching an index + * file (e.g., Packages or Sources). + * + * \sa pkgAcqDiffIndex, pkgAcqIndexDiffs, pkgAcqIndexTrans + * + * \todo Why does pkgAcqIndex have protected members? + */ class pkgAcqIndex : public pkgAcquire::Item { protected: - + + /** \brief If \b true, the index file has been decompressed. */ bool Decompression; + + /** \brief If \b true, the partially downloaded file will be + * removed when the download completes. + */ bool Erase; + + /** \brief The download request that is currently being + * processed. + */ pkgAcquire::ItemDesc Desc; + + /** \brief The object that is actually being fetched (minus any + * compression-related extensions). + */ string RealURI; - string ExpectedMD5; + + /** \brief The expected hashsum of the decompressed index file. */ + HashString ExpectedHash; + + /** \brief The compression-related file extension that is being + * added to the downloaded file (e.g., ".gz" or ".bz2"). + */ string CompressionExtension; public: @@ -166,27 +523,126 @@ class pkgAcqIndex : public pkgAcquire::Item pkgAcquire::MethodConfig *Cnf); virtual string Custom600Headers(); virtual string DescURI() {return RealURI + CompressionExtension;}; - + virtual string HashSum() {return ExpectedHash.toStr(); }; + + /** \brief Create a pkgAcqIndex. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param URI The URI of the index file that is to be downloaded. + * + * \param URIDesc A "URI-style" description of this index file. + * + * \param ShortDesc A brief description of this index file. + * + * \param ExpectedHash The expected hashsum of this index file. + * + * \param compressExt The compression-related extension with which + * this index file should be downloaded, or "" to autodetect + * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + */ pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct, string ExpectedMD5, string compressExt=""); + string ShortDesc, HashString ExpectedHash, string compressExt=""); +}; + +/** \brief An acquire item that is responsible for fetching a + * translated index file. + * + * The only difference from pkgAcqIndex is that transient failures + * are suppressed: no error occurs if the translated index file is + * missing. + */ +class pkgAcqIndexTrans : public pkgAcqIndex +{ + public: + + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + + /** \brief Create a pkgAcqIndexTrans. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param URI The URI of the index file that is to be downloaded. + * + * \param URIDesc A "URI-style" description of this index file. + * + * \param ShortDesc A brief description of this index file. + * + * \param ExpectedHash The expected hashsum of this index file. + * + * \param compressExt The compression-related extension with which + * this index file should be downloaded, or "" to autodetect + * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + */ + pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc, + string ShortDesc); }; +/** \brief Information about an index file. */ struct IndexTarget { + /** \brief A URI from which the index file can be downloaded. */ string URI; + + /** \brief A description of the index file. */ string Description; + + /** \brief A shorter description of the index file. */ string ShortDesc; + + /** \brief The key by which this index file should be + * looked up within the meta signature file. + */ string MetaKey; }; -// Item class for index signatures +/** \brief An acquire item that downloads the detached signature + * of a meta-index (Release) file, then queues up the release + * file itself. + * + * \todo Why protected members? + * + * \sa pkgAcqMetaIndex + */ class pkgAcqMetaSig : public pkgAcquire::Item { protected: - + /** \brief The last good signature file */ + string LastGoodSig; + + + /** \brief The fetch request that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI,MetaIndexURI,MetaIndexURIDesc,MetaIndexShortDesc; + + /** \brief The URI of the signature file. Unlike Desc.URI, this is + * never modified; it is used to determine the file that is being + * downloaded. + */ + string RealURI; + + /** \brief The URI of the meta-index file to be fetched after the signature. */ + string MetaIndexURI; + + /** \brief A "URI-style" description of the meta-index file to be + * fetched after the signature. + */ + string MetaIndexURIDesc; + + /** \brief A brief description of the meta-index file to be fetched + * after the signature. + */ + string MetaIndexShortDesc; + + /** \brief A package-system-specific parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief The index files which should be looked up in the meta-index + * and then downloaded. + * + * \todo Why a list of pointers instead of a list of structs? + */ const vector* IndexTargets; public: @@ -198,40 +654,102 @@ class pkgAcqMetaSig : public pkgAcquire::Item virtual string Custom600Headers(); virtual string DescURI() {return RealURI; }; + /** \brief Create a new pkgAcqMetaSig. */ pkgAcqMetaSig(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, string MetaIndexURI, string MetaIndexURIDesc, string MetaIndexShortDesc, const vector* IndexTargets, indexRecords* MetaIndexParser); }; -// Item class for index signatures +/** \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 + * the individual index files are queued up using pkgAcqDiffIndex. + * If the meta-index file had a valid signature, the expected hashsums + * of the index files will be the md5sums listed in the meta-index; + * otherwise, the expected hashsums will be "" (causing the + * authentication of the index files to be bypassed). + */ class pkgAcqMetaIndex : public pkgAcquire::Item { protected: - + /** \brief The fetch command that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI; // FIXME: is this redundant w/ Desc.URI? + + /** \brief The URI that is actually being downloaded; never + * modified by pkgAcqMetaIndex. + */ + string RealURI; + + /** \brief The file in which the signature for this index was stored. + * + * If empty, the signature and the md5sums of the individual + * indices will not be checked. + */ string SigFile; + + /** \brief The index files to download. */ const vector* IndexTargets; + + /** \brief The parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief If \b true, the index's signature is currently being verified. + */ bool AuthPass; // required to deal gracefully with problems caused by incorrect ims hits bool IMSHit; + /** \brief Check that the release file is a release file for the + * correct distribution. + * + * \return \b true if no fatal errors were encountered. + */ bool VerifyVendor(string Message); + + /** \brief Called when a file is finished being retrieved. + * + * If the file was not downloaded to DestFile, a copy process is + * set up to copy it to DestFile; otherwise, Complete is set to \b + * true and the file is moved to its final location. + * + * \param Message The message block received from the fetch + * subprocess. + */ void RetrievalDone(string Message); + + /** \brief Called when authentication succeeded. + * + * Sanity-checks the authenticated file, queues up the individual + * index files for download, and saves the signature in the lists + * directory next to the authenticated list file. + * + * \param Message The message block received from the fetch + * subprocess. + */ void AuthDone(string Message); + + /** \brief Starts downloading the individual index files. + * + * \param verify If \b true, only indices whose expected hashsum + * can be determined from the meta-index will be downloaded, and + * the hashsums of indices will be checked (reporting + * #StatAuthError if there is a mismatch). If verify is \b false, + * no hashsum checking will be performed. + */ void QueueIndexes(bool verify); public: // Specialized action members virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(string Message,unsigned long Size,string Md5Hash, + virtual void Done(string Message,unsigned long Size, string Hash, pkgAcquire::MethodConfig *Cnf); virtual string Custom600Headers(); virtual string DescURI() {return RealURI; }; + /** \brief Create a new pkgAcqMetaIndex. */ pkgAcqMetaIndex(pkgAcquire *Owner, string URI,string URIDesc, string ShortDesc, string SigFile, @@ -239,65 +757,152 @@ class pkgAcqMetaIndex : public pkgAcquire::Item indexRecords* MetaIndexParser); }; -// Item class for archive files +/** \brief An item that is responsible for fetching a package file. + * + * If the package file already exists in the cache, nothing will be + * done. + */ class pkgAcqArchive : public pkgAcquire::Item { protected: - - // State information for the retry mechanism + /** \brief The package version being fetched. */ pkgCache::VerIterator Version; + + /** \brief The fetch command that is currently being processed. */ pkgAcquire::ItemDesc Desc; + + /** \brief The list of sources from which to pick archives to + * download this package from. + */ pkgSourceList *Sources; + + /** \brief A package records object, used to look up the file + * corresponding to each version of the package. + */ pkgRecords *Recs; - string MD5; + + /** \brief The hashsum of this package. */ + HashString ExpectedHash; + + /** \brief A location in which the actual filename of the package + * should be stored. + */ string &StoreFilename; + + /** \brief The next file for this version to try to download. */ pkgCache::VerFileIterator Vf; + + /** \brief How many (more) times to try to find a new source from + * which to download this package version if it fails. + * + * Set from Acquire::Retries. + */ unsigned int Retries; + + /** \brief \b true if this version file is being downloaded from a + * trusted source. + */ bool Trusted; - // Queue the next available file for download. + /** \brief Queue up the next available file for this version. */ bool QueueNext(); public: - // Specialized action members virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(string Message,unsigned long Size,string Md5Hash, + virtual void Done(string Message,unsigned long Size,string Hash, pkgAcquire::MethodConfig *Cnf); - virtual string MD5Sum() {return MD5;}; virtual string DescURI() {return Desc.URI;}; virtual string ShortDesc() {return Desc.ShortDesc;}; virtual void Finished(); + virtual string HashSum() {return ExpectedHash.toStr(); }; virtual bool IsTrusted(); + /** \brief Create a new pkgAcqArchive. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param Sources The sources from which to download version + * files. + * + * \param Recs A package records object, used to look up the file + * corresponding to each version of the package. + * + * \param Version The package version to download. + * + * \param StoreFilename A location in which the actual filename of + * the package should be stored. It will be set to a guessed + * basename in the constructor, and filled in with a fully + * qualified filename once the download finishes. + */ pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs,pkgCache::VerIterator const &Version, string &StoreFilename); }; -// Fetch a generic 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 + * partial file is renamed to get a ".FAILED" extension. + */ class pkgAcqFile : public pkgAcquire::Item { + /** \brief The currently active download process. */ pkgAcquire::ItemDesc Desc; - string Md5Hash; + + /** \brief The hashsum of the file to download, if it is known. */ + HashString ExpectedHash; + + /** \brief How many times to retry the download, set from + * Acquire::Retries. + */ unsigned int Retries; public: // Specialized action members virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); - virtual void Done(string Message,unsigned long Size,string Md5Hash, + virtual void Done(string Message,unsigned long Size,string CalcHash, pkgAcquire::MethodConfig *Cnf); - virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - - // If DestFilename is empty, download to DestDir/ if - // DestDir is non-empty, $CWD/ otherwise. If - // DestFilename is NOT empty, DestDir is ignored and DestFilename - // is the absolute name to which the file should be downloaded. - pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size, + virtual string HashSum() {return ExpectedHash.toStr(); }; + + /** \brief Create a new pkgAcqFile object. + * + * \param Owner The pkgAcquire object with which this object is + * associated. + * + * \param URI The URI to download. + * + * \param Hash The hashsum of the file to download, if it is known; + * otherwise "". + * + * \param Size The size of the file to download, if it is known; + * otherwise 0. + * + * \param Desc A description of the file being downloaded. + * + * \param ShortDesc A brief description of the file being + * downloaded. + * + * \param DestDir The directory the file should be downloaded into. + * + * \param DestFilename The filename+path the file is downloaded to. + * + * + * If DestFilename is empty, download to DestDir/ if + * DestDir is non-empty, $CWD/ otherwise. If + * DestFilename is NOT empty, DestDir is ignored and DestFilename + * is the absolute name to which the file should be downloaded. + */ + + pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long Size, 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 41b832f..bc29417 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -15,9 +15,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/acquire-method.h" -#endif #include #include #include @@ -179,9 +176,14 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) TimeRFC1123(Res.LastModified).c_str()); if (Res.MD5Sum.empty() == false) + { End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str()); + End += snprintf(End,sizeof(S)-50 - (End - S),"MD5Sum-Hash: %s\n",Res.MD5Sum.c_str()); + } if (Res.SHA1Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str()); + if (Res.SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"SHA256-Hash: %s\n",Res.SHA256Sum.c_str()); if (Res.GPGVOutput.size() > 0) End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n"); for (vector::iterator I = Res.GPGVOutput.begin(); @@ -214,6 +216,9 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) if (Alt->SHA1Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n", Alt->SHA1Sum.c_str()); + if (Alt->SHA256Sum.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA256-Hash: %s\n", + Alt->SHA256Sum.c_str()); if (Alt->IMSHit == true) strcat(End,"Alt-IMS-Hit: true\n"); @@ -458,5 +463,6 @@ void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash) { MD5Sum = Hash.MD5.Result(); SHA1Sum = Hash.SHA1.Result(); + SHA256Sum = Hash.SHA256.Result(); } /*}}}*/ diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index f46209d..e02eab0 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -10,15 +10,19 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-method.h + */ + #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-method.h" -#endif class Hashes; class pkgAcqMethod @@ -39,6 +43,7 @@ class pkgAcqMethod { string MD5Sum; string SHA1Sum; + string SHA256Sum; vector GPGVOutput; time_t LastModified; bool IMSHit; @@ -86,4 +91,6 @@ class pkgAcqMethod virtual ~pkgAcqMethod() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index d060241..1a754da 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -12,9 +12,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/acquire-worker.h" -#endif #include #include #include @@ -270,8 +267,25 @@ bool pkgAcquire::Worker::RunMessages() _error->Warning("Bizarre Error - File size is not what the server reported %s %lu", LookupTag(Message,"Size","0").c_str(),TotalSize); + // see if there is a hash to verify + string RecivedHash; + HashString expectedHash(Owner->HashSum()); + if(!expectedHash.empty()) + { + string hashTag = expectedHash.HashType()+"-Hash"; + string hashSum = LookupTag(Message, hashTag.c_str()); + if(!hashSum.empty()) + RecivedHash = expectedHash.HashType() + ":" + hashSum; + if(_config->FindB("Debug::pkgAcquire::Auth", false) == true) + { + clog << "201 URI Done: " << Owner->DescURI() << endl + << "RecivedHash: " << RecivedHash << endl + << "ExpectedHash: " << expectedHash.toStr() + << endl << endl; + } + } Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()), - LookupTag(Message,"MD5-Hash"),Config); + RecivedHash.c_str(), Config); ItemDone(); // Log that we are done @@ -307,6 +321,14 @@ bool pkgAcquire::Worker::RunMessages() pkgAcquire::Item *Owner = Itm->Owner; pkgAcquire::ItemDesc Desc = *Itm; OwnerQ->ItemDone(Itm); + + // set some status + if(LookupTag(Message,"FailReason") == "Timeout" || + LookupTag(Message,"FailReason") == "TmpResolveFailure" || + LookupTag(Message,"FailReason") == "ResolveFailure" || + LookupTag(Message,"FailReason") == "ConnectionRefused") + Owner->Status = pkgAcquire::Item::StatTransientNetworkError; + Owner->Failed(Message,Config); ItemDone(); diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 6e19522..2942df6 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -9,16 +9,38 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-worker.h + */ + #ifndef PKGLIB_ACQUIRE_WORKER_H #define PKGLIB_ACQUIRE_WORKER_H #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-worker.h" -#endif -// Interfacing to the method process +/** \brief A fetch subprocess. + * + * A worker process is responsible for one stage of the fetch. This + * class encapsulates the communications protocol between the master + * process and the worker, from the master end. + * + * Each worker is intrinsically placed on two linked lists. The + * Queue list (maintained in the #NextQueue variable) is maintained + * by the pkgAcquire::Queue class; it represents the set of workers + * assigned to a particular queue. The Acquire list (maintained in + * the #NextAcquire variable) is maintained by the pkgAcquire class; + * it represents the set of active workers for a particular + * pkgAcquire object. + * + * \todo Like everything else in the Acquire system, this has way too + * many protected items. + * + * \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire + */ class pkgAcquire::Worker { friend class pkgAcquire; @@ -26,64 +48,274 @@ class pkgAcquire::Worker protected: friend class Queue; - /* Linked list starting at a Queue and a linked list starting - at Acquire */ + /** \brief The next link on the Queue list. + * + * \todo This is always NULL; is it just for future use? + */ Worker *NextQueue; + + /** \brief The next link on the Acquire list. */ Worker *NextAcquire; - // The access association + /** \brief The Queue with which this worker is associated. */ Queue *OwnerQ; + + /** \brief The download progress indicator to which progress + * messages should be sent. + */ pkgAcquireStatus *Log; + + /** \brief The configuration of this method. On startup, the + * target of this pointer is filled in with basic data about the + * method, as reported by the worker. + */ MethodConfig *Config; + + /** \brief The access method to be used by this worker. + * + * \todo Doesn't this duplicate Config->Access? + */ string Access; - // This is the subprocess IPC setup + /** \brief The PID of the subprocess. */ pid_t Process; + + /** \brief A file descriptor connected to the standard output of + * the subprocess. + * + * Used to read messages and data from the subprocess. + */ int InFd; + + /** \brief A file descriptor connected to the standard input of the + * subprocess. + * + * Used to send commands and configuration data to the subprocess. + */ int OutFd; + + /** \brief Set to \b true if the worker is in a state in which it + * might generate data or command responses. + * + * \todo Is this right? It's a guess. + */ bool InReady; + + /** \brief Set to \b true if the worker is in a state in which it + * is legal to send commands to it. + * + * \todo Is this right? + */ bool OutReady; - // Various internal things + /** If \b true, debugging output will be sent to std::clog. */ bool Debug; + + /** \brief The raw text values of messages received from the + * worker, in sequence. + */ vector MessageQueue; + + /** \brief Buffers pending writes to the subprocess. + * + * \todo Wouldn't a std::dequeue be more appropriate? + */ string OutQueue; - // Private constructor helper + /** \brief Common code for the constructor. + * + * Initializes NextQueue and NextAcquire to NULL; Process, InFd, + * and OutFd to -1, OutReady and InReady to \b false, and Debug + * from _config. + */ void Construct(); - // Message handling things + /** \brief Retrieve any available messages from the subprocess. + * + * The messages are retrieved as in ::ReadMessages(), and + * MessageFailure() is invoked if an error occurs; in particular, + * if the pipe to the subprocess dies unexpectedly while a message + * is being read. + * + * \return \b true if the messages were successfully read, \b + * false otherwise. + */ bool ReadMessages(); + + /** \brief Parse and dispatch pending messages. + * + * This dispatches the message in a manner appropriate for its + * type. + * + * \todo Several message types lack separate handlers. + * + * \sa Capabilities(), SendConfiguration(), MediaChange() + */ bool RunMessages(); + + /** \brief Read and dispatch any pending messages from the + * subprocess. + * + * \return \b false if the subprocess died unexpectedly while a + * message was being transmitted. + */ bool InFdReady(); + + /** \brief Send any pending commands to the subprocess. + * + * This method will fail if there is no pending output. + * + * \return \b true if all commands were succeeded, \b false if an + * error occurred (in which case MethodFailure() will be invoked). + */ bool OutFdReady(); - // The message handlers + /** \brief Handle a 100 Capabilities response from the subprocess. + * + * \param Message the raw text of the message from the subprocess. + * + * The message will be parsed and its contents used to fill + * #Config. If #Config is NULL, this routine is a NOP. + * + * \return \b true. + */ bool Capabilities(string Message); + + /** \brief Send a 601 Configuration message (containing the APT + * configuration) to the subprocess. + * + * The APT configuration will be send to the subprocess in a + * message of the following form: + * + * 
+    *  601 Configuration
+    *  Config-Item: Fully-Qualified-Item=Val
+    *  Config-Item: Fully-Qualified-Item=Val
+    *  ...
+    *
+ * + * \return \b true if the command was successfully sent, \b false + * otherwise. + */ bool SendConfiguration(); + + /** \brief Handle a 403 Media Change message. + * + * \param Message the raw text of the message; the Media field + * indicates what type of media should be changed, and the Drive + * field indicates where the media is located. + * + * Invokes pkgAcquireStatus::MediaChange(Media, Drive) to ask the + * user to swap disks; informs the subprocess of the result (via + * 603 Media Changed, with the Failed field set to \b true if the + * user cancelled the media change). + */ bool MediaChange(string Message); + /** \brief Invoked when the worked process dies unexpectedly. + * + * Waits for the subprocess to terminate and generates an error if + * it terminated abnormally, then closes and blanks out all file + * descriptors. Discards all pending messages from the + * subprocess. + * + * \return \b false. + */ bool MethodFailure(); + + /** \brief Invoked when a fetch job is completed, either + * successfully or unsuccessfully. + * + * Resets the status information for the worker process. + */ void ItemDone(); public: - // The curent method state + /** \brief The queue entry that is currently being downloaded. */ pkgAcquire::Queue::QItem *CurrentItem; + + /** \brief The most recent status string received from the + * subprocess. + */ string Status; + + /** \brief How many bytes of the file have been downloaded. Zero + * if the current progress of the file cannot be determined. + */ unsigned long CurrentSize; + + /** \brief The total number of bytes to be downloaded. Zero if the + * total size of the final is unknown. + */ unsigned long TotalSize; + + /** \brief How much of the file was already downloaded prior to + * starting this worker. + */ unsigned long ResumePoint; - // Load the method and do the startup + /** \brief Tell the subprocess to download the given item. + * + * \param Item the item to queue up. + * \return \b true if the item was successfully enqueued. + * + * Queues up a 600 URI Acquire message for the given item to be + * sent at the next possible moment. Does \e not flush the output + * queue. + */ bool QueueItem(pkgAcquire::Queue::QItem *Item); + + /** \brief Start up the worker and fill in #Config. + * + * Reads the first message from the worker, which is assumed to be + * a 100 Capabilities message. + * + * \return \b true if all operations completed successfully. + */ bool Start(); + + /** \brief Update the worker statistics (CurrentSize, TotalSize, + * etc). + */ void Pulse(); + + /** \return The fetch method configuration. */ inline const MethodConfig *GetConf() const {return Config;}; - + + /** \brief Create a new Worker to download files. + * + * \param OwnerQ The queue into which this worker should be + * placed. + * + * \param Config A location in which to store information about + * the fetch method. + * + * \param Log The download progress indicator that should be used + * to report the progress of this worker. + */ Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log); + + /** \brief Create a new Worker that should just retrieve + * information about the fetch method. + * + * Nothing in particular forces you to refrain from actually + * downloading stuff, but the various status callbacks won't be + * invoked. + * + * \param Config A location in which to store information about + * the fetch method. + */ Worker(MethodConfig *Config); + + /** \brief Clean up this worker. + * + * Closes the file descriptors; if MethodConfig::NeedsCleanup is + * \b false, also rudely interrupts the worker with a SIGINT. + */ ~Worker(); }; +/** @} */ + #endif diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index b1463dc..cb69dbb 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -13,9 +13,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/acquire.h" -#endif #include #include #include @@ -193,9 +190,9 @@ void pkgAcquire::Enqueue(ItemDesc &Item) Item.Owner->Status = Item::StatIdle; // Queue it into the named queue - I->Enqueue(Item); - ToFetch++; - + if(I->Enqueue(Item)) + ToFetch++; + // Some trace stuff if (Debug == true) { @@ -465,8 +462,9 @@ bool pkgAcquire::Clean(string Dir) unlink(Dir->d_name); }; - chdir(StartDir.c_str()); closedir(D); + if (chdir(StartDir.c_str()) != 0) + return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str()); return true; } /*}}}*/ @@ -567,11 +565,17 @@ pkgAcquire::Queue::~Queue() // Queue::Enqueue - Queue an item to the queue /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcquire::Queue::Enqueue(ItemDesc &Item) +bool pkgAcquire::Queue::Enqueue(ItemDesc &Item) { QItem **I = &Items; - for (; *I != 0; I = &(*I)->Next); - + // move to the end of the queue and check for duplicates here + for (; *I != 0; I = &(*I)->Next) + if (Item.URI == (*I)->URI) + { + Item.Owner->Status = Item::StatDone; + return false; + } + // Create a new item QItem *Itm = new QItem; *Itm = Item; @@ -581,6 +585,7 @@ void pkgAcquire::Queue::Enqueue(ItemDesc &Item) Item.Owner->QueueCounter++; if (Items->Next == 0) Cycle(); + return true; } /*}}}*/ // Queue::Dequeue - Remove an item from the queue /*{{{*/ @@ -633,7 +638,7 @@ bool pkgAcquire::Queue::Startup() added other source retry to have cycle maintain a pipeline depth on its own. */ if (Cnf->Pipeline == true) - MaxPipeDepth = 10; + MaxPipeDepth = 1000; else MaxPipeDepth = 1; } @@ -810,7 +815,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) // Compute the CPS struct timeval NewTime; gettimeofday(&NewTime,0); - if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec || + if ((NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec) || NewTime.tv_sec - Time.tv_sec > 6) { double Delta = NewTime.tv_sec - Time.tv_sec + diff --git a/apt-pkg/acquire.cc.orig b/apt-pkg/acquire.cc.orig new file mode 100644 index 0000000..daea234 --- /dev/null +++ b/apt-pkg/acquire.cc.orig @@ -0,0 +1,890 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: acquire.cc,v 1.50 2004/03/17 05:17:11 mdz Exp $ +/* ###################################################################### + + Acquire - File Acquiration + + The core element for the schedual system is the concept of a named + queue. Each queue is unique and each queue has a name derived from the + URI. The degree of paralization can be controled by how the queue + name is derived from the URI. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include + /*}}}*/ + +using namespace std; + +// Acquire::pkgAcquire - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* We grab some runtime state from the configuration space */ +pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) +{ + Queues = 0; + Configs = 0; + Workers = 0; + ToFetch = 0; + Running = false; + + string Mode = _config->Find("Acquire::Queue-Mode","host"); + if (strcasecmp(Mode.c_str(),"host") == 0) + QueueMode = QueueHost; + if (strcasecmp(Mode.c_str(),"access") == 0) + QueueMode = QueueAccess; + + Debug = _config->FindB("Debug::pkgAcquire",false); + + // This is really a stupid place for this + struct stat St; + if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 || + S_ISDIR(St.st_mode) == 0) + _error->Error(_("Lists directory %spartial is missing."), + _config->FindDir("Dir::State::lists").c_str()); + if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 || + S_ISDIR(St.st_mode) == 0) + _error->Error(_("Archive directory %spartial is missing."), + _config->FindDir("Dir::Cache::Archives").c_str()); +} + /*}}}*/ +// Acquire::~pkgAcquire - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* Free our memory, clean up the queues (destroy the workers) */ +pkgAcquire::~pkgAcquire() +{ + Shutdown(); + + while (Configs != 0) + { + MethodConfig *Jnk = Configs; + Configs = Configs->Next; + delete Jnk; + } +} + /*}}}*/ +// Acquire::Shutdown - Clean out the acquire object /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcquire::Shutdown() +{ + while (Items.size() != 0) + { + if (Items[0]->Status == Item::StatFetching) + Items[0]->Status = Item::StatError; + delete Items[0]; + } + + while (Queues != 0) + { + Queue *Jnk = Queues; + Queues = Queues->Next; + delete Jnk; + } +} + /*}}}*/ +// Acquire::Add - Add a new item /*{{{*/ +// --------------------------------------------------------------------- +/* This puts an item on the acquire list. This list is mainly for tracking + item status */ +void pkgAcquire::Add(Item *Itm) +{ + Items.push_back(Itm); +} + /*}}}*/ +// Acquire::Remove - Remove a item /*{{{*/ +// --------------------------------------------------------------------- +/* Remove an item from the acquire list. This is usually not used.. */ +void pkgAcquire::Remove(Item *Itm) +{ + Dequeue(Itm); + + for (ItemIterator I = Items.begin(); I != Items.end();) + { + if (*I == Itm) + { + Items.erase(I); + I = Items.begin(); + } + else + I++; + } +} + /*}}}*/ +// Acquire::Add - Add a worker /*{{{*/ +// --------------------------------------------------------------------- +/* A list of workers is kept so that the select loop can direct their FD + usage. */ +void pkgAcquire::Add(Worker *Work) +{ + Work->NextAcquire = Workers; + Workers = Work; +} + /*}}}*/ +// Acquire::Remove - Remove a worker /*{{{*/ +// --------------------------------------------------------------------- +/* A worker has died. This can not be done while the select loop is running + as it would require that RunFds could handling a changing list state and + it cant.. */ +void pkgAcquire::Remove(Worker *Work) +{ + if (Running == true) + abort(); + + Worker **I = &Workers; + for (; *I != 0;) + { + if (*I == Work) + *I = (*I)->NextAcquire; + else + I = &(*I)->NextAcquire; + } +} + /*}}}*/ +// Acquire::Enqueue - Queue an URI for fetching /*{{{*/ +// --------------------------------------------------------------------- +/* This is the entry point for an item. An item calls this function when + it is constructed which creates a queue (based on the current queue + mode) and puts the item in that queue. If the system is running then + the queue might be started. */ +void pkgAcquire::Enqueue(ItemDesc &Item) +{ + // Determine which queue to put the item in + const MethodConfig *Config; + string Name = QueueName(Item.URI,Config); + if (Name.empty() == true) + return; + + // Find the queue structure + Queue *I = Queues; + for (; I != 0 && I->Name != Name; I = I->Next); + if (I == 0) + { + I = new Queue(Name,this); + I->Next = Queues; + Queues = I; + + if (Running == true) + I->Startup(); + } + + // See if this is a local only URI + if (Config->LocalOnly == true && Item.Owner->Complete == false) + Item.Owner->Local = true; + Item.Owner->Status = Item::StatIdle; + + // Queue it into the named queue + if(I->Enqueue(Item)) + ToFetch++; + + // Some trace stuff + if (Debug == true) + { + clog << "Fetching " << Item.URI << endl; + clog << " to " << Item.Owner->DestFile << endl; + clog << " Queue is: " << Name << endl; + } +} + /*}}}*/ +// Acquire::Dequeue - Remove an item from all queues /*{{{*/ +// --------------------------------------------------------------------- +/* This is called when an item is finished being fetched. It removes it + from all the queues */ +void pkgAcquire::Dequeue(Item *Itm) +{ + Queue *I = Queues; + bool Res = false; + for (; I != 0; I = I->Next) + Res |= I->Dequeue(Itm); + + if (Debug == true) + clog << "Dequeuing " << Itm->DestFile << endl; + if (Res == true) + ToFetch--; +} + /*}}}*/ +// Acquire::QueueName - Return the name of the queue for this URI /*{{{*/ +// --------------------------------------------------------------------- +/* The string returned depends on the configuration settings and the + method parameters. Given something like http://foo.org/bar it can + return http://foo.org or http */ +string pkgAcquire::QueueName(string Uri,MethodConfig const *&Config) +{ + URI U(Uri); + + Config = GetConfig(U.Access); + if (Config == 0) + return string(); + + /* Single-Instance methods get exactly one queue per URI. This is + also used for the Access queue method */ + if (Config->SingleInstance == true || QueueMode == QueueAccess) + return U.Access; + + return U.Access + ':' + U.Host; +} + /*}}}*/ +// Acquire::GetConfig - Fetch the configuration information /*{{{*/ +// --------------------------------------------------------------------- +/* This locates the configuration structure for an access method. If + a config structure cannot be found a Worker will be created to + retrieve it */ +pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) +{ + // Search for an existing config + MethodConfig *Conf; + for (Conf = Configs; Conf != 0; Conf = Conf->Next) + if (Conf->Access == Access) + return Conf; + + // Create the new config class + Conf = new MethodConfig; + Conf->Access = Access; + Conf->Next = Configs; + Configs = Conf; + + // Create the worker to fetch the configuration + Worker Work(Conf); + if (Work.Start() == false) + return 0; + + /* if a method uses DownloadLimit, we switch to SingleInstance mode */ + if(_config->FindI("Acquire::"+Access+"::Dl-Limit",0) > 0) + Conf->SingleInstance = true; + + return Conf; +} + /*}}}*/ +// Acquire::SetFds - Deal with readable FDs /*{{{*/ +// --------------------------------------------------------------------- +/* Collect FDs that have activity monitors into the fd sets */ +void pkgAcquire::SetFds(int &Fd,fd_set *RSet,fd_set *WSet) +{ + for (Worker *I = Workers; I != 0; I = I->NextAcquire) + { + if (I->InReady == true && I->InFd >= 0) + { + if (Fd < I->InFd) + Fd = I->InFd; + FD_SET(I->InFd,RSet); + } + if (I->OutReady == true && I->OutFd >= 0) + { + if (Fd < I->OutFd) + Fd = I->OutFd; + FD_SET(I->OutFd,WSet); + } + } +} + /*}}}*/ +// Acquire::RunFds - Deal with active FDs /*{{{*/ +// --------------------------------------------------------------------- +/* Dispatch active FDs over to the proper workers. It is very important + that a worker never be erased while this is running! The queue class + should never erase a worker except during shutdown processing. */ +void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet) +{ + for (Worker *I = Workers; I != 0; I = I->NextAcquire) + { + if (I->InFd >= 0 && FD_ISSET(I->InFd,RSet) != 0) + I->InFdReady(); + if (I->OutFd >= 0 && FD_ISSET(I->OutFd,WSet) != 0) + I->OutFdReady(); + } +} + /*}}}*/ +// Acquire::Run - Run the fetch sequence /*{{{*/ +// --------------------------------------------------------------------- +/* This runs the queues. It manages a select loop for all of the + Worker tasks. The workers interact with the queues and items to + manage the actual fetch. */ +pkgAcquire::RunResult pkgAcquire::Run(int PulseIntervall) +{ + Running = true; + + for (Queue *I = Queues; I != 0; I = I->Next) + I->Startup(); + + if (Log != 0) + Log->Start(); + + bool WasCancelled = false; + + // Run till all things have been acquired + struct timeval tv; + tv.tv_sec = 0; + tv.tv_usec = PulseIntervall; + while (ToFetch > 0) + { + fd_set RFds; + fd_set WFds; + int Highest = 0; + FD_ZERO(&RFds); + FD_ZERO(&WFds); + SetFds(Highest,&RFds,&WFds); + + int Res; + do + { + Res = select(Highest+1,&RFds,&WFds,0,&tv); + } + while (Res < 0 && errno == EINTR); + + if (Res < 0) + { + _error->Errno("select","Select has failed"); + break; + } + + RunFds(&RFds,&WFds); + if (_error->PendingError() == true) + break; + + // Timeout, notify the log class + if (Res == 0 || (Log != 0 && Log->Update == true)) + { + tv.tv_usec = PulseIntervall; + for (Worker *I = Workers; I != 0; I = I->NextAcquire) + I->Pulse(); + if (Log != 0 && Log->Pulse(this) == false) + { + WasCancelled = true; + break; + } + } + } + + if (Log != 0) + Log->Stop(); + + // Shut down the acquire bits + Running = false; + for (Queue *I = Queues; I != 0; I = I->Next) + I->Shutdown(false); + + // Shut down the items + for (ItemIterator I = Items.begin(); I != Items.end(); I++) + (*I)->Finished(); + + if (_error->PendingError()) + return Failed; + if (WasCancelled) + return Cancelled; + return Continue; +} + /*}}}*/ +// Acquire::Bump - Called when an item is dequeued /*{{{*/ +// --------------------------------------------------------------------- +/* This routine bumps idle queues in hopes that they will be able to fetch + the dequeued item */ +void pkgAcquire::Bump() +{ + for (Queue *I = Queues; I != 0; I = I->Next) + I->Bump(); +} + /*}}}*/ +// Acquire::WorkerStep - Step to the next worker /*{{{*/ +// --------------------------------------------------------------------- +/* Not inlined to advoid including acquire-worker.h */ +pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I) +{ + return I->NextAcquire; +}; + /*}}}*/ +// Acquire::Clean - Cleans a directory /*{{{*/ +// --------------------------------------------------------------------- +/* This is a bit simplistic, it looks at every file in the dir and sees + if it is part of the download set. */ +bool pkgAcquire::Clean(string Dir) +{ + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + string StartDir = SafeGetCWD(); + if (chdir(Dir.c_str()) != 0) + { + closedir(D); + return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str()); + } + + for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) + { + // Skip some files.. + if (strcmp(Dir->d_name,"lock") == 0 || + strcmp(Dir->d_name,"partial") == 0 || + strcmp(Dir->d_name,".") == 0 || + strcmp(Dir->d_name,"..") == 0) + continue; + + // Look in the get list + ItemCIterator I = Items.begin(); + for (; I != Items.end(); I++) + if (flNotDir((*I)->DestFile) == Dir->d_name) + break; + + // Nothing found, nuke it + if (I == Items.end()) + unlink(Dir->d_name); + }; + + closedir(D); + if (chdir(StartDir.c_str()) != 0) + return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str()); + return true; +} + /*}}}*/ +// Acquire::TotalNeeded - Number of bytes to fetch /*{{{*/ +// --------------------------------------------------------------------- +/* This is the total number of bytes needed */ +double pkgAcquire::TotalNeeded() +{ + double Total = 0; + for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) + Total += (*I)->FileSize; + return Total; +} + /*}}}*/ +// Acquire::FetchNeeded - Number of bytes needed to get /*{{{*/ +// --------------------------------------------------------------------- +/* This is the number of bytes that is not local */ +double pkgAcquire::FetchNeeded() +{ + double Total = 0; + for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) + if ((*I)->Local == false) + Total += (*I)->FileSize; + return Total; +} + /*}}}*/ +// Acquire::PartialPresent - Number of partial bytes we already have /*{{{*/ +// --------------------------------------------------------------------- +/* This is the number of bytes that is not local */ +double pkgAcquire::PartialPresent() +{ + double Total = 0; + for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) + if ((*I)->Local == false) + Total += (*I)->PartialSize; + return Total; +} + +// Acquire::UriBegin - Start iterator for the uri list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::UriIterator pkgAcquire::UriBegin() +{ + return UriIterator(Queues); +} + /*}}}*/ +// Acquire::UriEnd - End iterator for the uri list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::UriIterator pkgAcquire::UriEnd() +{ + return UriIterator(0); +} + /*}}}*/ + +// Acquire::MethodConfig::MethodConfig - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::MethodConfig::MethodConfig() +{ + SingleInstance = false; + Pipeline = false; + SendConfig = false; + LocalOnly = false; + Removable = false; + Next = 0; +} + /*}}}*/ + +// Queue::Queue - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::Queue::Queue(string Name,pkgAcquire *Owner) : Name(Name), + Owner(Owner) +{ + Items = 0; + Next = 0; + Workers = 0; + MaxPipeDepth = 1; + PipeDepth = 0; +} + /*}}}*/ +// Queue::~Queue - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::Queue::~Queue() +{ + Shutdown(true); + + while (Items != 0) + { + QItem *Jnk = Items; + Items = Items->Next; + delete Jnk; + } +} + /*}}}*/ +// Queue::Enqueue - Queue an item to the queue /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgAcquire::Queue::Enqueue(ItemDesc &Item) +{ + QItem **I = &Items; + // move to the end of the queue and check for duplicates here + for (; *I != 0; I = &(*I)->Next) + if (Item.URI == (*I)->URI) + { + Item.Owner->Status = Item::StatDone; + return false; + } + + // Create a new item + QItem *Itm = new QItem; + *Itm = Item; + Itm->Next = 0; + *I = Itm; + + Item.Owner->QueueCounter++; + if (Items->Next == 0) + Cycle(); + return true; +} + /*}}}*/ +// Queue::Dequeue - Remove an item from the queue /*{{{*/ +// --------------------------------------------------------------------- +/* We return true if we hit something */ +bool pkgAcquire::Queue::Dequeue(Item *Owner) +{ + if (Owner->Status == pkgAcquire::Item::StatFetching) + return _error->Error("Tried to dequeue a fetching object"); + + bool Res = false; + + QItem **I = &Items; + for (; *I != 0;) + { + if ((*I)->Owner == Owner) + { + QItem *Jnk= *I; + *I = (*I)->Next; + Owner->QueueCounter--; + delete Jnk; + Res = true; + } + else + I = &(*I)->Next; + } + + return Res; +} + /*}}}*/ +// Queue::Startup - Start the worker processes /*{{{*/ +// --------------------------------------------------------------------- +/* It is possible for this to be called with a pre-existing set of + workers. */ +bool pkgAcquire::Queue::Startup() +{ + if (Workers == 0) + { + URI U(Name); + pkgAcquire::MethodConfig *Cnf = Owner->GetConfig(U.Access); + if (Cnf == 0) + return false; + + Workers = new Worker(this,Cnf,Owner->Log); + Owner->Add(Workers); + if (Workers->Start() == false) + return false; + + /* When pipelining we commit 10 items. This needs to change when we + added other source retry to have cycle maintain a pipeline depth + on its own. */ + if (Cnf->Pipeline == true) + MaxPipeDepth = 1000; + else + MaxPipeDepth = 1; + } + + return Cycle(); +} + /*}}}*/ +// Queue::Shutdown - Shutdown the worker processes /*{{{*/ +// --------------------------------------------------------------------- +/* If final is true then all workers are eliminated, otherwise only workers + that do not need cleanup are removed */ +bool pkgAcquire::Queue::Shutdown(bool Final) +{ + // Delete all of the workers + pkgAcquire::Worker **Cur = &Workers; + while (*Cur != 0) + { + pkgAcquire::Worker *Jnk = *Cur; + if (Final == true || Jnk->GetConf()->NeedsCleanup == false) + { + *Cur = Jnk->NextQueue; + Owner->Remove(Jnk); + delete Jnk; + } + else + Cur = &(*Cur)->NextQueue; + } + + return true; +} + /*}}}*/ +// Queue::FindItem - Find a URI in the item list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Worker *Owner) +{ + for (QItem *I = Items; I != 0; I = I->Next) + if (I->URI == URI && I->Worker == Owner) + return I; + return 0; +} + /*}}}*/ +// Queue::ItemDone - Item has been completed /*{{{*/ +// --------------------------------------------------------------------- +/* The worker signals this which causes the item to be removed from the + queue. If this is the last queue instance then it is removed from the + main queue too.*/ +bool pkgAcquire::Queue::ItemDone(QItem *Itm) +{ + PipeDepth--; + if (Itm->Owner->Status == pkgAcquire::Item::StatFetching) + Itm->Owner->Status = pkgAcquire::Item::StatDone; + + if (Itm->Owner->QueueCounter <= 1) + Owner->Dequeue(Itm->Owner); + else + { + Dequeue(Itm->Owner); + Owner->Bump(); + } + + return Cycle(); +} + /*}}}*/ +// Queue::Cycle - Queue new items into the method /*{{{*/ +// --------------------------------------------------------------------- +/* This locates a new idle item and sends it to the worker. If pipelining + is enabled then it keeps the pipe full. */ +bool pkgAcquire::Queue::Cycle() +{ + if (Items == 0 || Workers == 0) + return true; + + if (PipeDepth < 0) + return _error->Error("Pipedepth failure"); + + // Look for a queable item + QItem *I = Items; + while (PipeDepth < (signed)MaxPipeDepth) + { + for (; I != 0; I = I->Next) + if (I->Owner->Status == pkgAcquire::Item::StatIdle) + break; + + // Nothing to do, queue is idle. + if (I == 0) + return true; + + I->Worker = Workers; + I->Owner->Status = pkgAcquire::Item::StatFetching; + PipeDepth++; + if (Workers->QueueItem(I) == false) + return false; + } + + return true; +} + /*}}}*/ +// Queue::Bump - Fetch any pending objects if we are idle /*{{{*/ +// --------------------------------------------------------------------- +/* This is called when an item in multiple queues is dequeued */ +void pkgAcquire::Queue::Bump() +{ + Cycle(); +} + /*}}}*/ + +// AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgAcquireStatus::pkgAcquireStatus() : Update(true), MorePulses(false) +{ + Start(); +} + /*}}}*/ +// AcquireStatus::Pulse - Called periodically /*{{{*/ +// --------------------------------------------------------------------- +/* This computes some internal state variables for the derived classes to + use. It generates the current downloaded bytes and total bytes to download + as well as the current CPS estimate. */ +bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) +{ + TotalBytes = 0; + CurrentBytes = 0; + TotalItems = 0; + CurrentItems = 0; + + // Compute the total number of bytes to fetch + unsigned int Unknown = 0; + unsigned int Count = 0; + for (pkgAcquire::ItemCIterator I = Owner->ItemsBegin(); I != Owner->ItemsEnd(); + I++, Count++) + { + TotalItems++; + if ((*I)->Status == pkgAcquire::Item::StatDone) + CurrentItems++; + + // Totally ignore local items + if ((*I)->Local == true) + continue; + + TotalBytes += (*I)->FileSize; + if ((*I)->Complete == true) + CurrentBytes += (*I)->FileSize; + if ((*I)->FileSize == 0 && (*I)->Complete == false) + Unknown++; + } + + // Compute the current completion + unsigned long ResumeSize = 0; + for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0; + I = Owner->WorkerStep(I)) + if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false) + { + CurrentBytes += I->CurrentSize; + ResumeSize += I->ResumePoint; + + // Files with unknown size always have 100% completion + if (I->CurrentItem->Owner->FileSize == 0 && + I->CurrentItem->Owner->Complete == false) + TotalBytes += I->CurrentSize; + } + + // Normalize the figures and account for unknown size downloads + if (TotalBytes <= 0) + TotalBytes = 1; + if (Unknown == Count) + TotalBytes = Unknown; + + // Wha?! Is not supposed to happen. + if (CurrentBytes > TotalBytes) + CurrentBytes = TotalBytes; + + // Compute the CPS + struct timeval NewTime; + gettimeofday(&NewTime,0); + if ((NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec) || + NewTime.tv_sec - Time.tv_sec > 6) + { + double Delta = NewTime.tv_sec - Time.tv_sec + + (NewTime.tv_usec - Time.tv_usec)/1000000.0; + + // Compute the CPS value + if (Delta < 0.01) + CurrentCPS = 0; + else + CurrentCPS = ((CurrentBytes - ResumeSize) - LastBytes)/Delta; + LastBytes = CurrentBytes - ResumeSize; + ElapsedTime = (unsigned long)Delta; + Time = NewTime; + } + + int fd = _config->FindI("APT::Status-Fd",-1); + if(fd > 0) + { + ostringstream status; + + char msg[200]; + long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems; + unsigned long ETA = + (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); + + // only show the ETA if it makes sense + if (ETA > 0 && ETA < 172800 /* two days */ ) + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + else + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems); + + + + // build the status str + status << "dlstatus:" << i + << ":" << (CurrentBytes/float(TotalBytes)*100.0) + << ":" << msg + << endl; + write(fd, status.str().c_str(), status.str().size()); + } + + return true; +} + /*}}}*/ +// AcquireStatus::Start - Called when the download is started /*{{{*/ +// --------------------------------------------------------------------- +/* We just reset the counters */ +void pkgAcquireStatus::Start() +{ + gettimeofday(&Time,0); + gettimeofday(&StartTime,0); + LastBytes = 0; + CurrentCPS = 0; + CurrentBytes = 0; + TotalBytes = 0; + FetchedBytes = 0; + ElapsedTime = 0; + TotalItems = 0; + CurrentItems = 0; +} + /*}}}*/ +// AcquireStatus::Stop - Finished downloading /*{{{*/ +// --------------------------------------------------------------------- +/* This accurately computes the elapsed time and the total overall CPS. */ +void pkgAcquireStatus::Stop() +{ + // Compute the CPS and elapsed time + struct timeval NewTime; + gettimeofday(&NewTime,0); + + double Delta = NewTime.tv_sec - StartTime.tv_sec + + (NewTime.tv_usec - StartTime.tv_usec)/1000000.0; + + // Compute the CPS value + if (Delta < 0.01) + CurrentCPS = 0; + else + CurrentCPS = FetchedBytes/Delta; + LastBytes = CurrentBytes; + ElapsedTime = (unsigned int)Delta; +} + /*}}}*/ +// AcquireStatus::Fetched - Called when a byte set has been fetched /*{{{*/ +// --------------------------------------------------------------------- +/* This is used to get accurate final transfer rate reporting. */ +void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume) +{ + FetchedBytes += Size - Resume; +} + /*}}}*/ diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 27bb3d3..1de6f5e 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -29,6 +29,40 @@ ##################################################################### */ /*}}}*/ + +/** \defgroup acquire Acquire system + * + * \brief The Acquire system is responsible for retrieving files from + * local or remote URIs and postprocessing them (for instance, + * verifying their authenticity). The core class in this system is + * pkgAcquire, which is responsible for managing the download queues + * during the download. There is at least one download queue for + * each supported protocol; protocols such as http may provide one + * queue per host. + * + * Each file to download is represented by a subclass of + * pkgAcquire::Item. The files add themselves to the download + * queue(s) by providing their URI information to + * pkgAcquire::Item::QueueURI, which calls pkgAcquire::Enqueue. + * + * Once the system is set up, the Run method will spawn subprocesses + * to handle the enqueued URIs; the scheduler will then take items + * from the queues and feed them into the handlers until the queues + * are empty. + * + * \todo Acquire supports inserting an object into several queues at + * 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 + * + * @{ + * + * \file acquire.h + */ + #ifndef PKGLIB_ACQUIRE_H #define PKGLIB_ACQUIRE_H @@ -38,14 +72,20 @@ using std::vector; using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire.h" -#endif #include #include class pkgAcquireStatus; + +/** \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 + * down download-related structures. + * + * \todo Why all the protected data items and methods? + */ class pkgAcquire { public: @@ -60,97 +100,299 @@ class pkgAcquire typedef vector::iterator ItemIterator; typedef vector::const_iterator ItemCIterator; - + protected: - // List of items to fetch + /** \brief A list of items to download. + * + * This is built monotonically as items are created and only + * emptied when the download shuts down. + */ vector Items; - // List of active queues and fetched method configuration parameters + /** \brief The head of the list of active queues. + * + * \todo why a hand-managed list of queues instead of std::list or + * std::set? + */ Queue *Queues; + + /** \brief The head of the list of active workers. + * + * \todo why a hand-managed list of workers instead of std::list + * or std::set? + */ Worker *Workers; + + /** \brief The head of the list of acquire method configurations. + * + * Each protocol (http, ftp, gzip, etc) via which files can be + * fetched can have a representation in this list. The + * configuration data is filled in by parsing the 100 Capabilities + * string output by a method on startup (see + * pkgAcqMethod::pkgAcqMethod and pkgAcquire::GetConfig). + * + * \todo why a hand-managed config dictionary instead of std::map? + */ MethodConfig *Configs; + + /** \brief The progress indicator for this download. */ pkgAcquireStatus *Log; + + /** \brief The total size of the files which are to be fetched. + * + * This is not necessarily the total number of bytes to download + * when, e.g., download resumption and list updates via patches + * are taken into account. + */ unsigned long ToFetch; - // Configurable parameters for the schedular - enum {QueueHost,QueueAccess} QueueMode; + // Configurable parameters for the scheduler + + /** \brief Represents the queuing strategy for remote URIs. */ + enum QueueStrategy { + /** \brief Generate one queue for each protocol/host combination; downloads from + * multiple hosts can proceed in parallel. + */ + QueueHost, + /** \brief Generate a single queue for each protocol; serialize + * downloads from multiple hosts. + */ + QueueAccess} QueueMode; + + /** \brief If \b true, debugging information will be dumped to std::clog. */ bool Debug; + /** \brief If \b true, a download is currently in progress. */ bool Running; - + + /** \brief Add the given item to the list of items. */ void Add(Item *Item); + + /** \brief Remove the given item from the list of items. */ void Remove(Item *Item); + + /** \brief Add the given worker to the list of workers. */ void Add(Worker *Work); + + /** \brief Remove the given worker from the list of workers. */ void Remove(Worker *Work); + /** \brief Insert the given fetch request into the appropriate queue. + * + * \param Item The URI to download and the item to download it + * for. Copied by value into the queue; no reference to Item is + * retained. + */ void Enqueue(ItemDesc &Item); + + /** \brief Remove all fetch requests for this item from all queues. */ void Dequeue(Item *Item); + + /** \brief Determine the fetch method and queue of a URI. + * + * \param URI The URI to fetch. + * + * \param[out] Config A location in which to place the method via + * which the URI is to be fetched. + * + * \return the string-name of the queue in which a fetch request + * for the given URI should be placed. + */ string QueueName(string URI,MethodConfig const *&Config); - // FDSET managers for derived classes + /** \brief Build up the set of file descriptors upon which select() should + * block. + * + * The default implementation inserts the file descriptors + * corresponding to active downloads. + * + * \param[out] Fd The largest file descriptor in the generated sets. + * + * \param[out] RSet The set of file descriptors that should be + * watched for input. + * + * \param[out] WSet The set of file descriptors that should be + * watched for output. + */ virtual void SetFds(int &Fd,fd_set *RSet,fd_set *WSet); + + /** Handle input from and output to file descriptors which select() + * has determined are ready. The default implementation + * dispatches to all active downloads. + * + * \param RSet The set of file descriptors that are ready for + * input. + * + * \param WSet The set of file descriptors that are ready for + * output. + */ virtual void RunFds(fd_set *RSet,fd_set *WSet); - // A queue calls this when it dequeues an item + /** \brief Check for idle queues with ready-to-fetch items. + * + * Called by pkgAcquire::Queue::Done each time an item is dequeued + * but remains on some queues; i.e., another queue should start + * fetching it. + */ void Bump(); public: + /** \brief Retrieve information about a fetch method by name. + * + * \param Access The name of the method to look up. + * + * \return the method whose name is Access, or \b NULL if no such method exists. + */ MethodConfig *GetConfig(string Access); - enum RunResult {Continue,Failed,Cancelled}; + /** \brief Provides information on how a download terminated. */ + enum RunResult { + /** \brief All files were fetched successfully. */ + Continue, + + /** \brief Some files failed to download. */ + Failed, + + /** \brief The download was cancelled by the user (i.e., #Log's + * pkgAcquireStatus::Pulse() method returned \b false). + */ + Cancelled}; + + /** \brief Download all the items that have been Add()ed to this + * download process. + * + * This method will block until the download completes, invoking + * methods on #Log to report on the progress of the download. + * + * \param PulseInterval The method pkgAcquireStatus::Pulse will be + * invoked on #Log at intervals of PulseInterval milliseconds. + * + * \return the result of the download. + */ + RunResult Run(int PulseInterval=500000); - RunResult Run(int PulseIntervall=500000); + /** \brief Remove all items from this download process, terminate + * all download workers, and empty all queues. + */ void Shutdown(); - // Simple iteration mechanism + /** \brief Get the first #Worker object. + * + * \return the first active worker in this download process. + */ inline Worker *WorkersBegin() {return Workers;}; + + /** \brief Advance to the next #Worker object. + * + * \return the worker immediately following I, or \b NULL if none + * exists. + */ Worker *WorkerStep(Worker *I); + + /** \brief Get the head of the list of items. */ inline ItemIterator ItemsBegin() {return Items.begin();}; + + /** \brief Get the end iterator of the list of items. */ inline ItemIterator ItemsEnd() {return Items.end();}; // Iterate over queued Item URIs class UriIterator; + /** \brief Get the head of the list of enqueued item URIs. + * + * This iterator will step over every element of every active + * queue. + */ UriIterator UriBegin(); + /** \brief Get the end iterator of the list of enqueued item URIs. */ UriIterator UriEnd(); - // Cleans out the download dir + /** Deletes each entry in the given directory that is not being + * downloaded by this object. For instance, when downloading new + * list files, calling Clean() will delete the old ones. + * + * \param Dir The directory to be cleaned out. + * + * \return \b true if the directory exists and is readable. + */ bool Clean(string Dir); - // Returns the size of the total download set + /** \return the total size in bytes of all the items included in + * this download. + */ double TotalNeeded(); + + /** \return the size in bytes of all non-local items included in + * this download. + */ double FetchNeeded(); + + /** \return the amount of data to be fetched that is already + * present on the filesystem. + */ double PartialPresent(); + /** \brief Construct a new pkgAcquire. + * + * \param Log The progress indicator associated with this + * download, or \b NULL for none. This object is not owned by the + * download process and will not be deleted when the pkgAcquire + * object is destroyed. Naturally, it should live for at least as + * long as the pkgAcquire object does. + */ pkgAcquire(pkgAcquireStatus *Log = 0); + + /** \brief Destroy this pkgAcquire object. + * + * Destroys all queue, method, and item objects associated with + * this download. + */ virtual ~pkgAcquire(); }; -// Description of an Item+URI +/** \brief Represents a single download source from which an item + * should be downloaded. + * + * An item may have several assocated ItemDescs over its lifetime. + */ struct pkgAcquire::ItemDesc { + /** \brief The URI from which to download this item. */ string URI; + /** brief A description of this item. */ string Description; + /** brief A shorter description of this item. */ string ShortDesc; + /** brief The underlying item which is to be downloaded. */ Item *Owner; }; -// List of possible items queued for download. +/** \brief A single download queue in a pkgAcquire object. + * + * \todo Why so many protected values? + */ class pkgAcquire::Queue { friend class pkgAcquire; friend class pkgAcquire::UriIterator; friend class pkgAcquire::Worker; + + /** \brief The next queue in the pkgAcquire object's list of queues. */ Queue *Next; protected: - // Queued item + /** \brief A single item placed in this queue. */ struct QItem : pkgAcquire::ItemDesc { - QItem *Next; + /** \brief The next item in the queue. */ + QItem *Next; + /** \brief The worker associated with this item, if any. */ pkgAcquire::Worker *Worker; - + + /** \brief Assign the ItemDesc portion of this QItem from + * another ItemDesc + */ void operator =(pkgAcquire::ItemDesc const &I) { URI = I.URI; @@ -160,45 +402,145 @@ class pkgAcquire::Queue }; }; - // Name of the queue + /** \brief The name of this queue. */ string Name; - // Items queued into this queue + /** \brief The head of the list of items contained in this queue. + * + * \todo why a by-hand list instead of an STL structure? + */ QItem *Items; + + /** \brief The head of the list of workers associated with this queue. + * + * \todo This is plural because support exists in Queue for + * multiple workers. However, it does not appear that there is + * any way to actually associate more than one worker with a + * queue. + * + * \todo Why not just use a std::set? + */ pkgAcquire::Worker *Workers; + + /** \brief the download scheduler with which this queue is associated. */ pkgAcquire *Owner; + + /** \brief The number of entries in this queue that are currently + * being downloaded. + */ signed long PipeDepth; + + /** \brief The maximum number of entries that this queue will + * attempt to download at once. + */ unsigned long MaxPipeDepth; public: - // Put an item into this queue - void Enqueue(ItemDesc &Item); + /** \brief Insert the given fetch request into this queue. + * + * \return \b true if the queuing was successful. May return + * \b false if the Item is already in the queue + */ + bool Enqueue(ItemDesc &Item); + + /** \brief Remove all fetch requests for the given item from this queue. + * + * \return \b true if at least one request was removed from the queue. + */ bool Dequeue(Item *Owner); - // Find a Queued item + /** \brief Locate an item in this queue. + * + * \param URI A URI to match against. + * \param Owner A pkgAcquire::Worker to match against. + * + * \return the first item in the queue whose URI is #URI and that + * is being downloaded by #Owner. + */ QItem *FindItem(string URI,pkgAcquire::Worker *Owner); + + /** Presumably this should start downloading an item? + * + * \todo Unimplemented. Implement it or remove? + */ bool ItemStart(QItem *Itm,unsigned long Size); + + /** \brief Remove the given item from this queue and set its state + * to pkgAcquire::Item::StatDone. + * + * If this is the only queue containing the item, the item is also + * removed from the main queue by calling pkgAcquire::Dequeue. + * + * \param Itm The item to remove. + * + * \return \b true if no errors are encountered. + */ bool ItemDone(QItem *Itm); + /** \brief Start the worker process associated with this queue. + * + * If a worker process is already associated with this queue, + * this is equivalent to calling Cycle(). + * + * \return \b true if the startup was successful. + */ bool Startup(); + + /** \brief Shut down the worker process associated with this queue. + * + * \param Final If \b true, then the process is stopped unconditionally. + * Otherwise, it is only stopped if it does not need cleanup + * as indicated by the pkgAcqMethod::NeedsCleanup member of + * its configuration. + * + * \return \b true. + */ bool Shutdown(bool Final); + + /** \brief Send idle items to the worker process. + * + * Fills up the pipeline by inserting idle items into the worker's queue. + */ bool Cycle(); + + /** \brief Check for items that could be enqueued. + * + * Call this after an item placed in multiple queues has gone from + * the pkgAcquire::Item::StatFetching state to the + * pkgAcquire::Item::StatIdle state, to possibly refill an empty queue. + * This is an alias for Cycle(). + * + * \todo Why both this and Cycle()? Are they expected to be + * different someday? + */ void Bump(); + /** \brief Create a new Queue. + * + * \param Name The name of the new queue. + * \param Owner The download process that owns the new queue. + */ Queue(string Name,pkgAcquire *Owner); + + /** Shut down all the worker processes associated with this queue + * and empty the queue. + */ ~Queue(); }; +/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */ class pkgAcquire::UriIterator { + /** The next queue to iterate over. */ pkgAcquire::Queue *CurQ; + /** The item that we currently point at. */ pkgAcquire::Queue::QItem *CurItem; public: - // Advance to the next item inline void operator ++() {operator ++();}; + void operator ++(int) { CurItem = CurItem->Next; @@ -209,11 +551,14 @@ class pkgAcquire::UriIterator } }; - // Accessors inline pkgAcquire::ItemDesc const *operator ->() const {return CurItem;}; inline bool operator !=(UriIterator const &rhs) const {return rhs.CurQ != CurQ || rhs.CurItem != CurItem;}; inline bool operator ==(UriIterator const &rhs) const {return rhs.CurQ == CurQ && rhs.CurItem == CurItem;}; + /** \brief Create a new UriIterator. + * + * \param Q The queue over which this UriIterator should iterate. + */ UriIterator(pkgAcquire::Queue *Q) : CurQ(Q), CurItem(0) { while (CurItem == 0 && CurQ != 0) @@ -224,61 +569,200 @@ class pkgAcquire::UriIterator } }; -// Configuration information from each method +/** \brief Information about the properties of a single acquire method. */ struct pkgAcquire::MethodConfig { + /** \brief The next link on the acquire method list. + * + * \todo Why not an STL container? + */ MethodConfig *Next; + /** \brief The name of this acquire method (e.g., http). */ string Access; + /** \brief The implementation version of this acquire method. */ string Version; + + /** \brief If \b true, only one download queue should be created for this + * method. + */ bool SingleInstance; + + /** \brief If \b true, this method supports pipelined downloading. */ bool Pipeline; + + /** \brief If \b true, the worker process should send the entire + * APT configuration tree to the fetch subprocess when it starts + * up. + */ bool SendConfig; + + /** \brief If \b true, this fetch method does not require network access; + * all files are to be acquired from the local disk. + */ bool LocalOnly; + + /** \brief If \b true, the subprocess has to carry out some cleanup + * actions before shutting down. + * + * For instance, the cdrom method needs to unmount the CD after it + * finishes. + */ bool NeedsCleanup; + + /** \brief If \b true, this fetch method acquires files from removable media. */ bool Removable; + /** \brief Set up the default method parameters. + * + * All fields are initialized to NULL, "", or \b false as + * appropriate. + */ MethodConfig(); }; +/** \brief A monitor object for downloads controlled by the pkgAcquire class. + * + * \todo Why protected members? + * + * \todo Should the double members be uint64_t? + */ class pkgAcquireStatus { protected: + /** \brief The last time at which this monitor object was updated. */ struct timeval Time; + + /** \brief The time at which the download started. */ struct timeval StartTime; + + /** \brief The number of bytes fetched as of the previous call to + * pkgAcquireStatus::Pulse, including local items. + */ double LastBytes; + + /** \brief The current rate of download as of the most recent call + * to pkgAcquireStatus::Pulse, in bytes per second. + */ double CurrentCPS; + + /** \brief The number of bytes fetched as of the most recent call + * to pkgAcquireStatus::Pulse, including local items. + */ double CurrentBytes; + + /** \brief The total number of bytes that need to be fetched. + * + * \warning This member is inaccurate, as new items might be + * enqueued while the download is in progress! + */ double TotalBytes; + + /** \brief The total number of bytes accounted for by items that + * were successfully fetched. + */ double FetchedBytes; + + /** \brief The amount of time that has elapsed since the download + * started. + */ unsigned long ElapsedTime; + + /** \brief The total number of items that need to be fetched. + * + * \warning This member is inaccurate, as new items might be + * enqueued while the download is in progress! + */ unsigned long TotalItems; + + /** \brief The number of items that have been successfully downloaded. */ unsigned long CurrentItems; public: + /** \brief If \b true, the download scheduler should call Pulse() + * at the next available opportunity. + */ bool Update; + + /** \brief If \b true, extra Pulse() invocations will be performed. + * + * With this option set, Pulse() will be called every time that a + * download item starts downloading, finishes downloading, or + * terminates with an error. + */ bool MorePulses; - // Called by items when they have finished a real download + /** \brief Invoked when a local or remote file has been completely fetched. + * + * \param Size The size of the file fetched. + * + * \param ResumePoint How much of the file was already fetched. + */ virtual void Fetched(unsigned long Size,unsigned long ResumePoint); - // Called to change media + /** \brief Invoked when the user should be prompted to change the + * inserted removable media. + * + * This method should not return until the user has confirmed to + * the user interface that the media change is complete. + * + * \param Media The name of the media type that should be changed. + * + * \param Drive The identifying name of the drive whose media + * should be changed. + * + * \return \b true if the user confirms the media change, \b + * false if it is cancelled. + * + * \todo This is a horrible blocking monster; it should be CPSed + * with prejudice. + */ virtual bool MediaChange(string Media,string Drive) = 0; - // Each of these is called by the workers when an event occures + /** \brief Invoked when an item is confirmed to be up-to-date. + + * For instance, when an HTTP download is informed that the file on + * the server was not modified. + */ virtual void IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when some of an item's data is fetched. */ virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when an item is successfully and completely fetched. */ virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {}; + + /** \brief Invoked when the process of fetching an item encounters + * a fatal error. + */ virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {}; - virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel + + /** \brief Periodically invoked while the Acquire process is underway. + * + * Subclasses should first call pkgAcquireStatus::Pulse(), then + * update their status output. The download process is blocked + * while Pulse() is being called. + * + * \return \b false if the user asked to cancel the whole Acquire process. + * + * \see pkgAcquire::Run + */ + virtual bool Pulse(pkgAcquire *Owner); + + /** \brief Invoked when the Acquire process starts running. */ virtual void Start(); + + /** \brief Invoked when the Acquire process stops running. */ virtual void Stop(); + /** \brief Initialize all counters to 0 and the time to the current time. */ pkgAcquireStatus(); virtual ~pkgAcquireStatus() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 479927d..bd33d5e 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -14,16 +14,17 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/algorithms.h" -#endif #include #include #include +#include #include +#include #include - +#include +#include +#include #include /*}}}*/ using namespace std; @@ -36,7 +37,8 @@ pkgProblemResolver *pkgProblemResolver::This = 0; this is not necessary since the pkgCaches are fully shared now. */ pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache), iPolicy(Cache), - Sim(&Cache->GetCache(),&iPolicy) + Sim(&Cache->GetCache(),&iPolicy), + group(Sim) { Sim.Init(0); Flags = new unsigned char[Cache->Head().PackageCount]; @@ -100,6 +102,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) DepIterator End; D.GlobOr(Start,End); if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes || End->Type == pkgCache::Dep::PreDepends) { @@ -149,6 +152,8 @@ bool pkgSimulate::Configure(PkgIterator iPkg) cout << " Obsoletes:" << D.TargetPkg().Name(); else if (D->Type == pkgCache::Dep::Conflicts) cout << " Conflicts:" << D.TargetPkg().Name(); + else if (D->Type == pkgCache::Dep::DpkgBreaks) + cout << " Breaks:" << D.TargetPkg().Name(); else cout << " Depends:" << D.TargetPkg().Name(); } @@ -220,6 +225,8 @@ void pkgSimulate::ShortBreaks() the necessary calculations to deal with the problems. */ bool pkgApplyStatus(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (I->VersionList == 0) @@ -230,13 +237,13 @@ bool pkgApplyStatus(pkgDepCache &Cache) I->InstState == pkgCache::State::HoldReInstReq) { if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { // Is this right? Will dpkg choke on an upgrade? if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, false, 0, false); else return _error->Error(_("The package %s needs to be reinstalled, " "but I can't find an archive for it."),I.Name()); @@ -251,14 +258,16 @@ bool pkgApplyStatus(pkgDepCache &Cache) re-unpacked (probably) */ case pkgCache::State::UnPacked: case pkgCache::State::HalfConfigured: + case pkgCache::State::TriggersAwaited: + case pkgCache::State::TriggersPending: if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) || I.State() != pkgCache::PkgIterator::NeedsUnpack) - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); else { if (Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable() == true) - Cache.MarkInstall(I); + Cache.MarkInstall(I, true, 0, false); else Cache.MarkDelete(I); } @@ -284,10 +293,12 @@ bool pkgApplyStatus(pkgDepCache &Cache) on the result. */ bool pkgFixBroken(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + // Auto upgrade all broken packages for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (Cache[I].NowBroken() == true) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Fix packages that are in a NeedArchive state but don't have a downloadable install version */ @@ -300,7 +311,7 @@ bool pkgFixBroken(pkgDepCache &Cache) if (Cache[I].InstVerIter(Cache).Downloadable() == false) continue; - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); } pkgProblemResolver Fix(&Cache); @@ -317,23 +328,25 @@ bool pkgFixBroken(pkgDepCache &Cache) */ bool pkgDistUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + /* Auto upgrade all installed packages, this provides the basis for the installation */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* Now, auto upgrade all essential packages - this ensures that the essential packages are present and working */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Cache.MarkInstall(I,true); + Cache.MarkInstall(I, true, 0, false); /* We do it again over all previously installed packages to force conflict resolution on them all. */ for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) if (I->CurrentVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); pkgProblemResolver Fix(&Cache); @@ -345,7 +358,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache) if (I->SelectedState == pkgCache::State::Hold) { Fix.Protect(I); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } } } @@ -360,6 +373,8 @@ bool pkgDistUpgrade(pkgDepCache &Cache) to install packages not marked for install */ bool pkgAllUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + pkgProblemResolver Fix(&Cache); if (Cache.BrokenCount() != 0) @@ -376,7 +391,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache) continue; if (I->CurrentVer != 0 && Cache[I].InstallVer != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); } return Fix.ResolveByKeep(); @@ -389,6 +404,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache) the package is restored. */ bool pkgMinimizeUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + if (Cache.BrokenCount() != 0) return false; @@ -405,9 +422,9 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) continue; // Keep it and see if that is OK - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache.BrokenCount() != 0) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); else { // If keep didnt actually do anything then there was no change.. @@ -480,7 +497,7 @@ void pkgProblemResolver::MakeScores() signed short &Score = Scores[I->ID]; - /* This is arbitary, it should be high enough to elevate an + /* This is arbitrary, it should be high enough to elevate an essantial package above most other packages but low enough to allow an obsolete essential packages to be removed by a conflicts on a powerfull normal package (ie libc6) */ @@ -494,8 +511,10 @@ void pkgProblemResolver::MakeScores() Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority]; /* This helps to fix oddball problems with conflicting packages - on the same level. We enhance the score of installed packages */ - if (I->CurrentVer != 0) + on the same level. We enhance the score of installed packages + if those are not obsolete + */ + if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) Score += 1; } @@ -565,6 +584,8 @@ void pkgProblemResolver::MakeScores() installable */ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) { + pkgDepCache::ActionGroup group(Cache); + if ((Flags[Pkg->ID] & Upgradable) == 0 || Cache[Pkg].Upgradable() == false) return false; if ((Flags[Pkg->ID] & Protected) == Protected) @@ -573,7 +594,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) Flags[Pkg->ID] &= ~Upgradable; bool WasKept = Cache[Pkg].Keep(); - Cache.MarkInstall(Pkg,false); + Cache.MarkInstall(Pkg, false, 0, false); // This must be a virtual package or something like that. if (Cache[Pkg].InstVerIter(Cache).end() == true) @@ -637,6 +658,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) /* We let the algorithm deal with conflicts on its next iteration, it is much smarter than us */ if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes) break; @@ -658,7 +680,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) if (Fail == true) { if (WasKept == true) - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); else Cache.MarkDelete(Pkg); return false; @@ -685,6 +707,8 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) upgrade packages to advoid problems. */ bool pkgProblemResolver::Resolve(bool BrokenFix) { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; // Record which packages are marked for install @@ -700,7 +724,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Cache[I].InstBroken() == true && BrokenFix == true) { - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].Install() == true) Again = true; } @@ -766,14 +790,14 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) pkgCache::Version *OldVer = Cache[I].InstallVer; Flags[I->ID] &= ReInstateTried; - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Cache[I].InstBroken() == true || OldBreaks < Cache.BrokenCount()) { if (OldVer == 0) Cache.MarkDelete(I); else - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } else if (Debug == true) @@ -784,7 +808,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) continue; if (Debug == true) - cout << "Investigating " << I.Name() << endl; + clog << "Investigating " << I.Name() << endl; // Isolate the problem dependency PackageKill KillList[100]; @@ -818,7 +842,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Or group keep for " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); Change = true; } } @@ -839,7 +863,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) OldEnd = LEnd; } else + { Start++; + // We only worry about critical deps. + if (Start.IsCritical() != true) + continue; + } // Dep is ok if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall) @@ -857,6 +886,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) SPtrArray VList = Start.AllTargets(); if (*VList == 0 && (Flags[I->ID] & Protected) != Protected && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && Cache[I].NowBroken() == false) { @@ -868,7 +898,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } Change = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); break; } @@ -887,6 +917,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (Scores[I->ID] <= Scores[Pkg->ID] || ((Cache[Start] & pkgDepCache::DepNow) == 0 && End->Type != pkgCache::Dep::Conflicts && + End->Type != pkgCache::Dep::DpkgBreaks && End->Type != pkgCache::Dep::Obsoletes)) { // Try a little harder to fix protected packages.. @@ -905,7 +936,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) /* See if a keep will do, unless the package is protected, then installing it will be necessary */ bool Installed = Cache[I].Install(); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { // Unwind operation will be keep now @@ -914,7 +945,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; @@ -952,7 +983,22 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) (Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::Obsoletes)) continue; - + + if (Start->Type == pkgCache::Dep::DpkgBreaks) + { + // first, try upgradring the package, if that + // does not help, the breaks goes onto the + // kill list + // FIXME: use DoUpgrade(Pkg) instead? + if (Cache[End] & pkgDepCache::DepGCVer) + { + if (Debug) + clog << " Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl; + Cache.MarkInstall(Pkg, false, 0, false); + continue; + } + } + // Skip adding to the kill list if it is protected if ((Flags[Pkg->ID] & Protected) != 0) continue; @@ -973,6 +1019,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Hm, nothing can possibly satisify this dep. Nuke it. if (VList[0] == 0 && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && (Flags[I->ID] & Protected) != Protected) { @@ -986,7 +1033,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Restore if (InOr == true && Installed == true) - Cache.MarkInstall(I,false); + Cache.MarkInstall(I, false, 0, false); if (Debug == true) clog << " Holding Back " << I.Name() << " because I can't find " << Start.TargetPkg().Name() << endl; @@ -1020,6 +1067,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if ((Cache[J->Dep] & pkgDepCache::DepGNow) == 0) { if (J->Dep->Type == pkgCache::Dep::Conflicts || + J->Dep->Type == pkgCache::Dep::DpkgBreaks || J->Dep->Type == pkgCache::Dep::Obsoletes) { if (Debug == true) @@ -1031,7 +1079,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) { if (Debug == true) clog << " Fixing " << I.Name() << " via keep of " << J->Pkg.Name() << endl; - Cache.MarkKeep(J->Pkg); + Cache.MarkKeep(J->Pkg, false, false); } if (Counter > 1) @@ -1061,6 +1109,20 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) return _error->Error(_("Unable to correct problems, you have held broken packages.")); } + // set the auto-flags (mvo: I'm not sure if we _really_ need this, but + // I didn't managed + pkgCache::PkgIterator I = Cache.PkgBegin(); + for (;I.end() != true; I++) { + if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { + if(_config->FindI("Debug::pkgAutoRemove",false)) { + std::clog << "Resolve installed new pkg: " << I.Name() + << " (now marking it as auto)" << std::endl; + } + Cache[I].Flags |= pkgCache::Flag::Auto; + } + } + + return true; } /*}}}*/ @@ -1071,6 +1133,8 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) system was non-broken previously. */ bool pkgProblemResolver::ResolveByKeep() { + pkgDepCache::ActionGroup group(Cache); + unsigned long Size = Cache.Head().PackageCount; if (Debug == true) @@ -1104,7 +1168,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << "Keeping package " << I.Name() << endl; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); if (Cache[I].InstBroken() == false) { K = PList - 1; @@ -1152,7 +1216,7 @@ bool pkgProblemResolver::ResolveByKeep() { if (Debug == true) clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl; - Cache.MarkKeep(Pkg); + Cache.MarkKeep(Pkg, false, false); } if (Cache[I].InstBroken() == false) @@ -1189,14 +1253,21 @@ bool pkgProblemResolver::ResolveByKeep() /* This is used to make sure protected packages are installed */ void pkgProblemResolver::InstallProtect() { + pkgDepCache::ActionGroup group(Cache); + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if ((Flags[I->ID] & Protected) == Protected) { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I,false); + else + { + // preserve the information whether the package was auto + // or manually installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } @@ -1232,3 +1303,86 @@ 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 + * from the network (or any other sources defined in sources.list) + */ +bool ListUpdate(pkgAcquireStatus &Stat, + pkgSourceList &List, + int PulseInterval) +{ + pkgAcquire::RunResult res; + pkgAcquire Fetcher(&Stat); + + // Populate it with the source selection + if (List.GetIndexes(&Fetcher) == false) + return false; + + // Run scripts + RunScripts("APT::Update::Pre-Invoke"); + + // check arguments + if(PulseInterval>0) + res = Fetcher.Run(PulseInterval); + else + res = Fetcher.Run(); + + if (res == pkgAcquire::Failed) + return false; + + bool Failed = false; + bool TransientNetworkFailure = false; + for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); + I != Fetcher.ItemsEnd(); I++) + { + if ((*I)->Status == pkgAcquire::Item::StatDone) + continue; + + (*I)->Finished(); + + ::URI uri((*I)->DescURI()); + uri.User.clear(); + uri.Password.clear(); + string descUri = string(uri); + _error->Warning(_("Failed to fetch %s %s\n"), descUri.c_str(), + (*I)->ErrorText.c_str()); + + if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) + { + TransientNetworkFailure = true; + continue; + } + + Failed = true; + } + + // Clean out any old list files + // Keep "APT::Get::List-Cleanup" name for compatibility, but + // this is really a global option for the APT library now + if (!TransientNetworkFailure && !Failed && + (_config->FindB("APT::Get::List-Cleanup",true) == true && + _config->FindB("APT::List-Cleanup",true) == true)) + { + if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || + Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) + // something went wrong with the clean + return false; + } + + if (TransientNetworkFailure == true) + _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + else if (Failed == true) + return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + + + // Run the success scripts if all was fine + if(!TransientNetworkFailure && !Failed) + RunScripts("APT::Update::Post-Invoke-Success"); + + // Run the other scripts + RunScripts("APT::Update::Post-Invoke"); + return true; +} + /*}}}*/ diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index b952180..d183cd2 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -30,12 +30,10 @@ #ifndef PKGLIB_ALGORITHMS_H #define PKGLIB_ALGORITHMS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/algorithms.h" -#endif #include #include +#include #include @@ -62,6 +60,7 @@ class pkgSimulate : public pkgPackageManager Policy iPolicy; pkgDepCache Sim; + pkgDepCache::ActionGroup group; // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); @@ -133,5 +132,7 @@ bool pkgAllUpgrade(pkgDepCache &Cache); bool pkgMinimizeUpgrade(pkgDepCache &Cache); void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List); + +bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0); #endif diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index ab30030..1a84aea 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -12,10 +12,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/cachefile.h" -#endif - #include #include #include @@ -23,6 +19,8 @@ #include #include #include +#include +#include #include /*}}}*/ @@ -111,6 +109,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) } /*}}}*/ + // CacheFile::Close - close the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index a128c29..3b05795 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -17,11 +17,10 @@ #ifndef PKGLIB_CACHEFILE_H #define PKGLIB_CACHEFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cachefile.h" -#endif #include +#include +#include class pkgPolicy; class pkgCacheFile diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 2b326bd..08eafca 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cacheiterators.h" -#endif // Package Iterator class pkgCache::PkgIterator @@ -99,7 +96,7 @@ class pkgCache::VerIterator { Version *Ver; pkgCache *Owner; - + void _dummy(); public: @@ -128,6 +125,8 @@ class pkgCache::VerIterator inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;}; inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);}; + inline DescIterator DescriptionList() const; + DescIterator TranslatedDescription() const; inline DepIterator DependsList() const; inline PrvIterator ProvidesList() const; inline VerFileIterator FileList() const; @@ -148,6 +147,50 @@ class pkgCache::VerIterator }; }; +// Description Iterator +class pkgCache::DescIterator +{ + Description *Desc; + pkgCache *Owner; + + void _dummy(); + + public: + + // Iteration + void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;}; + inline void operator ++() {operator ++(0);}; + inline bool end() const {return Desc == Owner->DescP?true:false;}; + inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;}; + + // Comparison + inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;}; + inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;}; + int CompareDesc(const DescIterator &B) const; + + // Accessors + inline Description *operator ->() {return Desc;}; + inline Description const *operator ->() const {return Desc;}; + inline Description &operator *() {return *Desc;}; + inline Description const &operator *() const {return *Desc;}; + inline operator Description *() {return Desc == Owner->DescP?0:Desc;}; + inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;}; + inline pkgCache *Cache() {return Owner;}; + + inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;}; + inline const char *md5() const {return Owner->StrP + Desc->md5sum;}; + inline DescFileIterator FileList() const; + inline unsigned long Index() const {return Desc - Owner->DescP;}; + + inline DescIterator() : Desc(0), Owner(0) {}; + inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg), + Owner(&Owner) + { + if (Desc == 0) + Desc = Owner.DescP; + }; +}; + // Dependency iterator class pkgCache::DepIterator { @@ -338,6 +381,38 @@ class pkgCache::VerFileIterator inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {}; }; +// Description File +class pkgCache::DescFileIterator +{ + pkgCache *Owner; + DescFile *FileP; + + public: + + // Iteration + void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;}; + inline void operator ++() {operator ++(0);}; + inline bool end() const {return FileP == Owner->DescFileP?true:false;}; + + // Comparison + inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;}; + inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;}; + + // Accessors + inline DescFile *operator ->() {return FileP;}; + inline DescFile const *operator ->() const {return FileP;}; + inline DescFile const &operator *() const {return *FileP;}; + inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;}; + inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;}; + inline pkgCache *Cache() {return Owner;}; + + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; + inline unsigned long Index() const {return FileP - Owner->DescFileP;}; + + 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 inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}; @@ -347,11 +422,15 @@ inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);}; inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);}; +inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const + {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);}; inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);}; inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);}; 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 ce1beb3..370687f 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -1,9 +1,6 @@ /* */ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/cdrom.h" -#endif #include #include #include @@ -18,6 +15,7 @@ #include #include #include +#include #include "indexcopy.h" @@ -30,12 +28,16 @@ using namespace std; search that short circuits when it his a package file in the dir. This speeds it up greatly as the majority of the size is in the binary-* sub dirs. */ -bool pkgCdrom::FindPackages(string CD,vector &List, - vector &SList, vector &SigList, +bool pkgCdrom::FindPackages(string CD, + vector &List, + vector &SList, + vector &SigList, + vector &TransList, string &InfoDir, pkgCdromStatus *log, unsigned int Depth) { static ino_t Inodes[9]; + DIR *D; // if we have a look we "pulse" now if(log) @@ -90,8 +92,28 @@ bool pkgCdrom::FindPackages(string CD,vector &List, if (_config->FindB("APT::CDROM::Thorough",false) == false) return true; } + + // see if we find translatin indexes + if (stat("i18n",&Buf) == 0) + { + D = opendir("i18n"); + for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) + { + if(strstr(Dir->d_name,"Translation") != NULL) + { + if (_config->FindB("Debug::aptcdrom",false) == true) + std::clog << "found translations: " << Dir->d_name << "\n"; + string file = Dir->d_name; + if(file.substr(file.size()-3,file.size()) == ".gz") + file = file.substr(0,file.size()-3); + TransList.push_back(CD+"i18n/"+ file); + } + } + closedir(D); + } + - DIR *D = opendir("."); + D = opendir("."); if (D == 0) return _error->Errno("opendir","Unable to read %s",CD.c_str()); @@ -127,7 +149,7 @@ bool pkgCdrom::FindPackages(string CD,vector &List, Inodes[Depth] = Buf.st_ino; // Descend - if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false) + if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false) break; if (chdir(CD.c_str()) != 0) @@ -538,10 +560,17 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) } if(log) { msg.str(""); - ioprintf(msg, _("Stored label: %s \n"), - Database.Find("CD::"+ident).c_str()); + ioprintf(msg, _("Stored label: %s\n"), + Database.Find("CD::"+ident).c_str()); log->Update(msg.str()); } + + // Unmount and finish + if (_config->FindB("APT::CDROM::NoMount",false) == false) { + log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST); + UnmountCdrom(CDROM); + } + return true; } @@ -612,9 +641,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log) vector List; vector SourceList; vector SigList; + vector TransList; string StartDir = SafeGetCWD(); string InfoDir; - if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false) + if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false) { log->Update("\n"); return false; @@ -642,17 +672,20 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(List,"Packages"); DropRepeats(SourceList,"Sources"); DropRepeats(SigList,"Release.gpg"); + DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %i package indexes, %i source indexes and " - "%i signatures\n"), - List.size(), SourceList.size(), SigList.size()); + ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + "%zu translation indexes and %zu signatures\n"), + List.size(), SourceList.size(), TransList.size(), + SigList.size()); log->Update(msg.str(), STEP_SCAN); } if (List.size() == 0 && SourceList.size() == 0) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc"); } @@ -679,7 +712,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) if(log) { msg.str(""); - ioprintf(msg, "Found label '%s'\n", Name.c_str()); + ioprintf(msg, _("Found label '%s'\n"), Name.c_str()); log->Update(msg.str()); } Database.Set("CD::" + ID + "::Label",Name); @@ -691,7 +724,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) { if(!log) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("No disc name found and no way to ask for it"); } @@ -736,8 +770,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log) // Copy the package files to the state directory PackageCopy Copy; SourceCopy SrcCopy; + TranslationsCopy TransCopy; if (Copy.CopyPackages(CDROM,Name,List, log) == false || - SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false) + SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false || + TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false) return false; // reduce the List so that it takes less space in sources.list @@ -767,7 +803,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } @@ -784,7 +821,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } @@ -800,7 +838,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) // Unmount and finish if (_config->FindB("APT::CDROM::NoMount",false) == false) { - log->Update(_("Unmounting CD-ROM..."), STEP_LAST); + log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST); UnmountCdrom(CDROM); } diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 085eb64..68d61c0 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -5,9 +5,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdrom.h" -#endif using namespace std; @@ -50,8 +47,11 @@ class pkgCdrom }; - bool FindPackages(string CD,vector &List, - vector &SList, vector &SigList, + bool FindPackages(string CD, + vector &List, + vector &SList, + vector &SigList, + vector &TransList, string &InfoDir, pkgCdromStatus *log, unsigned int Depth = 0); bool DropBinaryArch(vector &List); diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 0d623d8..3fa67e8 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -8,10 +8,6 @@ ##################################################################### */ /*}}}*/ // Includes /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/clean.h" -#endif - #include #include #include diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index 43164e2..2aee2bf 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -10,9 +10,6 @@ #ifndef APTPKG_CLEAN_H #define APTPKG_CLEAN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/clean.h" -#endif #include diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index ab170ec..b6524a1 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -10,9 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/cdromutl.h" -#endif #include #include #include @@ -179,7 +176,8 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version) Hash.Add(Dir->d_name); }; - chdir(StartDir.c_str()); + if (chdir(StartDir.c_str()) != 0) + return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str()); closedir(D); // Some stats from the fsys diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 3180a03..f24bb8c 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -8,18 +8,15 @@ ##################################################################### */ /*}}}*/ #ifndef PKGLIB_CDROMUTL_H -#define PKGLIB_ACQUIRE_METHOD_H +#define PKGLIB_CDROMUTL_H #include using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdromutl.h" -#endif - bool MountCdrom(string Path); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); +bool IsMounted(string &Path); #endif diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 2b3d7dc..bfd5369 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -11,9 +11,6 @@ ##################################################################### */ /*}}}*/ // Include files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/cmndline.h" -#endif #include #include #include @@ -192,7 +189,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], if ((A->Flags & ConfigFile) == ConfigFile) return ReadConfigFile(*Conf,Argument); - // Arbitary item specification + // Arbitrary item specification if ((A->Flags & ArbItem) == ArbItem) { const char *J; diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 8f46129..e28071e 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -34,7 +34,7 @@ ConfigFile - Means this flag should be interprited as the name of a config file to read in at this point in option processing. Implies HasArg. - ArbItem - Means the item is an arbitary configuration string of + ArbItem - Means the item is an arbitrary configuration string of the form item=value, where item is passed directly to the configuration class. The default, if the flags are 0 is to use Boolean @@ -44,9 +44,7 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cmndline.h" -#endif + #include diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 14a000f..7326b84 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -15,9 +15,6 @@ ##################################################################### */ /*}}}*/ // Include files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/configuration.h" -#endif #include #include #include @@ -176,6 +173,11 @@ string Configuration::Find(const char *Name,const char *Default) const */ string Configuration::FindFile(const char *Name,const char *Default) const { + const Item *RootItem = Lookup("RootDir"); + std::string rootDir = (RootItem == 0) ? "" : RootItem->Value; + if(rootDir.size() > 0 && rootDir[rootDir.size() - 1] != '/') + rootDir.push_back('/'); + const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) { @@ -207,7 +209,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const Itm = Itm->Parent; } - return val; + return rootDir + val; } /*}}}*/ // Configuration::FindDir - Find a directory name /*{{{*/ @@ -425,6 +427,7 @@ bool Configuration::ExistsAny(const char *Name) const string key = Name; if (key.size() > 2 && key.end()[-2] == '/') + { if (key.find_first_of("fdbi",key.size()-1) < key.size()) { key.resize(key.size() - 2); @@ -435,7 +438,7 @@ bool Configuration::ExistsAny(const char *Name) const { _error->Warning(_("Unrecognized type abbreviation: '%c'"), key.end()[-3]); } - + } return Exists(Name); } /*}}}*/ @@ -492,8 +495,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, ifstream F(FName.c_str(),ios::in); if (!F != 0) return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str()); - - char Buffer[1024]; + string LineBuffer; string Stack[100]; unsigned int StackPos = 0; @@ -505,23 +507,63 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, bool InComment = false; while (F.eof() == false) { - F.getline(Buffer,sizeof(Buffer)); + // The raw input line. + std::string Input; + // The input line with comments stripped. + std::string Fragment; + + // Grab the next line of F and place it in Input. + do + { + char *Buffer = new char[1024]; + + F.clear(); + F.getline(Buffer,sizeof(Buffer) / 2); + + Input += Buffer; + } + while (F.fail() && !F.eof()); + + // Expand tabs in the input line and remove leading and trailing + // whitespace. + { + const int BufferSize = Input.size() * 8 + 1; + char *Buffer = new char[BufferSize]; + try + { + memcpy(Buffer, Input.c_str(), Input.size() + 1); + + _strtabexpand(Buffer, BufferSize); + _strstrip(Buffer); + Input = Buffer; + } + catch(...) + { + delete[] Buffer; + throw; + } + delete[] Buffer; + } CurLine++; - // This should be made to work instead, but this is better than looping - if (F.fail() && !F.eof()) - return _error->Error(_("Line %d too long (max %d)"), CurLine, sizeof(Buffer)); - _strtabexpand(Buffer,sizeof(Buffer)); - _strstrip(Buffer); + // Now strip comments; if the whole line is contained in a + // comment, skip this line. + + // The first meaningful character in the current fragment; will + // be adjusted below as we remove bytes from the front. + std::string::const_iterator Start = Input.begin(); + // The last meaningful character in the current fragment. + std::string::const_iterator End = Input.end(); // Multi line comment if (InComment == true) { - for (const char *I = Buffer; *I != 0; I++) + for (std::string::const_iterator I = Start; + I != End; ++I) { - if (*I == '*' && I[1] == '/') + if (*I == '*' && I + 1 != End && I[1] == '/') { - memmove(Buffer,I+2,strlen(I+2) + 1); + Start = I + 2; InComment = false; break; } @@ -532,57 +574,66 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, // Discard single line comments bool InQuote = false; - for (char *I = Buffer; *I != 0; I++) + for (std::string::const_iterator I = Start; + I != End; ++I) { if (*I == '"') InQuote = !InQuote; if (InQuote == true) continue; - if (*I == '/' && I[1] == '/') + if (*I == '/' && I + 1 != End && I[1] == '/') { - *I = 0; + End = I; break; } } - // Look for multi line comments + // Look for multi line comments and build up the + // fragment. + Fragment.reserve(End - Start); InQuote = false; - for (char *I = Buffer; *I != 0; I++) + for (std::string::const_iterator I = Start; + I != End; ++I) { if (*I == '"') InQuote = !InQuote; if (InQuote == true) - continue; - - if (*I == '/' && I[1] == '*') + Fragment.push_back(*I); + else if (*I == '/' && I + 1 != End && I[1] == '*') { InComment = true; - for (char *J = Buffer; *J != 0; J++) + for (std::string::const_iterator J = I; + J != End; ++J) { - if (*J == '*' && J[1] == '/') + if (*J == '*' && J + 1 != End && J[1] == '/') { - memmove(I,J+2,strlen(J+2) + 1); + // Pretend we just finished walking over the + // comment, and don't add anything to the output + // fragment. + I = J + 1; InComment = false; break; } } if (InComment == true) - { - *I = 0; - break; - } + break; } + else + Fragment.push_back(*I); } - - // Blank - if (Buffer[0] == 0) + + // Skip blank lines. + if (Fragment.empty()) continue; - // We now have a valid line fragment + // The line has actual content; interpret what it means. InQuote = false; - for (char *I = Buffer; *I != 0;) + Start = Fragment.begin(); + End = Fragment.end(); + for (std::string::const_iterator I = Start; + I != End; ++I) { if (*I == '"') InQuote = !InQuote; @@ -590,18 +641,21 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, if (InQuote == false && (*I == '{' || *I == ';' || *I == '}')) { // Put the last fragment into the buffer - char *Start = Buffer; - char *Stop = I; - for (; Start != I && isspace(*Start) != 0; Start++); - for (; Stop != Start && isspace(Stop[-1]) != 0; Stop--); - if (LineBuffer.empty() == false && Stop - Start != 0) + std::string::const_iterator NonWhitespaceStart = Start; + std::string::const_iterator NonWhitespaceStop = I; + for (; NonWhitespaceStart != I && isspace(*NonWhitespaceStart) != 0; NonWhitespaceStart++) + ; + for (; NonWhitespaceStop != NonWhitespaceStart && isspace(NonWhitespaceStop[-1]) != 0; NonWhitespaceStop--) + ; + if (LineBuffer.empty() == false && NonWhitespaceStop - NonWhitespaceStart != 0) LineBuffer += ' '; - LineBuffer += string(Start,Stop - Start); - - // Remove the fragment + LineBuffer += string(NonWhitespaceStart, NonWhitespaceStop); + + // Drop this from the input string, saving the character + // that terminated the construct we just closed. (i.e., a + // brace or a semicolon) char TermChar = *I; - memmove(Buffer,I + 1,strlen(I + 1) + 1); - I = Buffer; + Start = I + 1; // Syntax Error if (TermChar == '{' && LineBuffer.empty() == true) @@ -723,15 +777,32 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, } } - else - I++; } - // Store the fragment - const char *Stripd = _strstrip(Buffer); - if (*Stripd != 0 && LineBuffer.empty() == false) - LineBuffer += " "; - LineBuffer += Stripd; + // Store the remaining text, if any, in the current line buffer. + + // NB: could change this to use string-based operations; I'm + // using strstrip now to ensure backwards compatibility. + // -- dburrows 2008-04-01 + { + char *Buffer = new char[End - Start + 1]; + try + { + std::copy(Start, End, Buffer); + Buffer[End - Start] = '\0'; + + const char *Stripd = _strstrip(Buffer); + if (*Stripd != 0 && LineBuffer.empty() == false) + LineBuffer += " "; + LineBuffer += Stripd; + } + catch(...) + { + delete[] Buffer; + throw; + } + delete[] Buffer; + } } if (LineBuffer.empty() == false) diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0d4078d..2534692 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -28,9 +28,7 @@ #ifndef PKGLIB_CONFIGURATION_H #define PKGLIB_CONFIGURATION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/configuration.h" -#endif + #include #include diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc index 52a5518..b300ed6 100644 --- a/apt-pkg/contrib/crc-16.cc +++ b/apt-pkg/contrib/crc-16.cc @@ -15,10 +15,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/crc-16.h" -#endif - #include /*}}}*/ diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h index 757104c..f30678b 100644 --- a/apt-pkg/contrib/crc-16.h +++ b/apt-pkg/contrib/crc-16.h @@ -10,10 +10,6 @@ #ifndef APTPKG_CRC16_H #define APTPKG_CRC16_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/crc-16.h" -#endif - #define INIT_FCS 0xffff unsigned short AddCRC16(unsigned short fcs, void const *buf, unsigned long len); diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 5fe9bdf..db8c53c 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -14,19 +14,17 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/error.h" -#endif - #include #include #include #include -#include #include #include +#include +#include + #include "config.h" /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a5fc1a2..a3be6a5 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -40,9 +40,7 @@ #ifndef PKGLIB_ERROR_H #define PKGLIB_ERROR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/error.h" -#endif + #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 9fd7172..a5976cf 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -8,15 +8,15 @@ CopyFile - Buffered copy of a single file GetLock - dpkg compatible lock file manipulation (fcntl) - This source is placed in the Public Domain, do with it what you will + Most of this source is placed in the Public Domain, do with it what + you will It was originally written by Jason Gunthorpe . + The exception is RunScripts() it is under the GPLv2 + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/fileutl.h" -#endif #include #include #include @@ -24,6 +24,9 @@ #include +#include +#include + #include #include #include @@ -38,6 +41,68 @@ using namespace std; +// RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool RunScripts(const char *Cnf) +{ + Configuration::Item const *Opts = _config->Tree(Cnf); + if (Opts == 0 || Opts->Child == 0) + return true; + Opts = Opts->Child; + + // Fork for running the system calls + pid_t Child = ExecFork(); + + // This is the child + if (Child == 0) + { + if (chdir("/tmp/") != 0) + _exit(100); + + unsigned int Count = 1; + for (; Opts != 0; Opts = Opts->Next, Count++) + { + if (Opts->Value.empty() == true) + continue; + + if (system(Opts->Value.c_str()) != 0) + _exit(100+Count); + } + _exit(0); + } + + // Wait for the child + int Status = 0; + while (waitpid(Child,&Status,0) != Child) + { + if (errno == EINTR) + continue; + return _error->Errno("waitpid","Couldn't wait for subprocess"); + } + + // Restore sig int/quit + signal(SIGQUIT,SIG_DFL); + signal(SIGINT,SIG_DFL); + + // Check for an error code. + if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) + { + unsigned int Count = WEXITSTATUS(Status); + if (Count > 100) + { + Count -= 100; + for (; Opts != 0 && Count != 1; Opts = Opts->Next, Count--); + _error->Error("Problem executing scripts %s '%s'",Cnf,Opts->Value.c_str()); + } + + return _error->Error("Sub-process returned an error code"); + } + + return true; +} + /*}}}*/ + // CopyFile - Buffered copy of a file /*{{{*/ // --------------------------------------------------------------------- /* The caller is expected to set things so that failure causes erasure */ @@ -73,7 +138,9 @@ bool CopyFile(FileFd &From,FileFd &To) close at some time. */ int GetLock(string File,bool Errors) { - int FD = open(File.c_str(),O_RDWR | O_CREAT | O_TRUNC,0640); + // GetLock() is used in aptitude on directories with public-write access + // Use O_NOFOLLOW here to prevent symlink traversal attacks + int FD = open(File.c_str(),O_RDWR | O_CREAT | O_NOFOLLOW,0640); if (FD < 0) { // Read only .. cant have locking problems there. diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 041aa33..73b5ea3 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -21,9 +21,6 @@ #ifndef PKGLIB_FILEUTL_H #define PKGLIB_FILEUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/fileutl.h" -#endif #include @@ -80,6 +77,7 @@ class FileFd virtual ~FileFd(); }; +bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 9b22a90..fcc2f88 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -11,16 +11,96 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/hashes.h" -#endif - #include +#include +#include #include #include +#include +#include /*}}}*/ +const char* HashString::_SupportedHashes[] = +{ + "SHA256", "SHA1", "MD5Sum", NULL +}; + +HashString::HashString() +{ +} + +HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash) +{ +} + +HashString::HashString(string StringedHash) +{ + // legacy: md5sum without "MD5Sum:" prefix + if (StringedHash.find(":") == string::npos && StringedHash.size() == 32) + { + Type = "MD5Sum"; + Hash = StringedHash; + return; + } + string::size_type pos = StringedHash.find(":"); + Type = StringedHash.substr(0,pos); + Hash = StringedHash.substr(pos+1, StringedHash.size() - pos); + + if(_config->FindB("Debug::Hashes",false) == true) + std::clog << "HashString(string): " << Type << " : " << Hash << std::endl; +} + + +bool HashString::VerifyFile(string filename) const +{ + FileFd fd; + MD5Summation MD5; + SHA1Summation SHA1; + SHA256Summation SHA256; + string fileHash; + + FileFd Fd(filename, FileFd::ReadOnly); + if(Type == "MD5Sum") + { + MD5.AddFD(Fd.Fd(), Fd.Size()); + fileHash = (string)MD5.Result(); + } + else if (Type == "SHA1") + { + SHA1.AddFD(Fd.Fd(), Fd.Size()); + fileHash = (string)SHA1.Result(); + } + else if (Type == "SHA256") + { + SHA256.AddFD(Fd.Fd(), Fd.Size()); + fileHash = (string)SHA256.Result(); + } + Fd.Close(); + + if(_config->FindB("Debug::Hashes",false) == true) + std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl; + + return (fileHash == Hash); +} + +const char** HashString::SupportedHashes() +{ + return _SupportedHashes; +} + +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/hashes.h b/apt-pkg/contrib/hashes.h index eefa7bf..264f7fe 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -13,17 +13,45 @@ #ifndef APTPKG_HASHES_H #define APTPKG_HASHES_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/hashes.h" -#endif #include #include #include #include +#include +#include using std::min; +using std::vector; + +// helper class that contains hash function name +// and hash +class HashString +{ + protected: + string Type; + string Hash; + static const char * _SupportedHashes[10]; + + public: + HashString(string Type, string Hash); + HashString(string StringedHashString); // init from str as "type:hash" + HashString(); + + // get hash type used + string HashType() { return Type; }; + + // verify the given filename against the currently loaded hash + bool VerifyFile(string filename) const; + + // helper + string toStr() const; // convert to str as "type:hash" + bool empty() const; + + // return the list of hashes we support + static const char** SupportedHashes(); +}; class Hashes { diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index fded5c8..a095f8f 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -35,10 +35,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/md5.h" -#endif - #include #include @@ -48,6 +44,7 @@ #include #include #include + /*}}}*/ // byteSwap - Swap bytes in a buffer /*{{{*/ diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index e280d71..96c8975 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -23,11 +23,9 @@ #ifndef APTPKG_MD5_H #define APTPKG_MD5_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/md5.h" -#endif #include +#include #include #include diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index e395e6c..04a4581 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -21,10 +21,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/mmap.h" -#endif - #define _BSD_SOURCE #include #include @@ -35,6 +31,8 @@ #include #include #include + +#include /*}}}*/ // MMap::MMap - Constructor /*{{{*/ @@ -119,7 +117,7 @@ bool MMap::Sync() #ifdef _POSIX_SYNCHRONIZED_IO if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base,iSize,MS_SYNC) != 0) + if (msync((char *)Base,iSize,MS_SYNC) < 0) return _error->Errno("msync","Unable to write mmap"); #endif return true; @@ -136,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) #ifdef _POSIX_SYNCHRONIZED_IO unsigned long PSize = sysconf(_SC_PAGESIZE); if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0) + if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) return _error->Errno("msync","Unable to write mmap"); #endif return true; @@ -194,7 +192,8 @@ DynamicMMap::~DynamicMMap() unsigned long EndOfFile = iSize; iSize = WorkSpace; Close(false); - ftruncate(Fd->Fd(),EndOfFile); + if(ftruncate(Fd->Fd(),EndOfFile) < 0) + _error->Errno("ftruncate", _("Failed to truncate file")); } /*}}}*/ // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space /*{{{*/ @@ -211,7 +210,8 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) // Just in case error check if (Result + Size > WorkSpace) { - _error->Error("Dynamic MMap ran out of room"); + _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; } @@ -273,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String, // Just in case error check if (Result + Len > WorkSpace) { - _error->Error("Dynamic MMap ran out of room"); + _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; } diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index e329b16..19cf758 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -25,9 +25,6 @@ #ifndef PKGLIB_MMAP_H #define PKGLIB_MMAP_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/mmap.h" -#endif #include #include diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index e3db9a4..cffdddc 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -8,9 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/progress.h" -#endif #include #include #include @@ -19,6 +16,7 @@ #include #include +#include /*}}}*/ using namespace std; diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 20caf4c..7dd004f 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -21,9 +21,6 @@ #ifndef PKGLIB_PROGRESS_H #define PKGLIB_PROGRESS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/progress.h" -#endif #include #include diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index 72eafd4..b70f31d 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -29,10 +29,6 @@ */ /*}}} */ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/sha1.h" -#endif - #include #include diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index db8ca78..8ddd889 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -14,11 +14,8 @@ #ifndef APTPKG_SHA1_H #define APTPKG_SHA1_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha1.h" -#endif - #include +#include #include using std::string; diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 70b3ae2..1951f05 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -14,11 +14,8 @@ #ifndef APTPKG_SHA256_H #define APTPKG_SHA256_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha256.h" -#endif - #include +#include #include using std::string; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index d961559..bd374fd 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -15,10 +15,6 @@ ##################################################################### */ /*}}}*/ // Includes /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/strutl.h" -#endif - #include #include #include @@ -28,16 +24,60 @@ #include #include #include +#include #include #include #include #include +#include #include "config.h" using namespace std; /*}}}*/ +// UTF8ToCodeset - Convert some UTF-8 string for some codeset /*{{{*/ +// --------------------------------------------------------------------- +/* This is handy to use before display some information for enduser */ +bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) +{ + iconv_t cd; + const char *inbuf; + char *inptr, *outbuf, *outptr; + size_t insize, outsize; + + cd = iconv_open(codeset, "UTF-8"); + if (cd == (iconv_t)(-1)) { + // Something went wrong + if (errno == EINVAL) + _error->Error("conversion from 'UTF-8' to '%s' not available", + codeset); + else + perror("iconv_open"); + + // Clean the destination string + *dest = ""; + + return false; + } + + insize = outsize = orig.size(); + inbuf = orig.data(); + inptr = (char *)inbuf; + outbuf = new char[insize+1]; + outptr = outbuf; + + iconv(cd, &inptr, &insize, &outptr, &outsize); + *outptr = '\0'; + + *dest = outbuf; + delete[] outbuf; + + iconv_close(cd); + + return true; +} + /*}}}*/ // strstrip - Remove white space from the front and back of a string /*{{{*/ // --------------------------------------------------------------------- /* This is handy to use when parsing a file. It also removes \n's left @@ -291,19 +331,19 @@ string TimeToStr(unsigned long Sec) { if (Sec > 60*60*24) { - sprintf(S,"%lid %lih%lim%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); + 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%lim%lis",Sec/60/60,(Sec/60) % 60,Sec % 60); + sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60) { - sprintf(S,"%lim%lis",Sec/60,Sec % 60); + sprintf(S,"%limin%lis",Sec/60,Sec % 60); break; } @@ -419,9 +459,9 @@ string Base64Encode(const string &S) return Final; } /*}}}*/ -// stringcmp - Arbitary string compare /*{{{*/ +// stringcmp - Arbitrary string compare /*{{{*/ // --------------------------------------------------------------------- -/* This safely compares two non-null terminated strings of arbitary +/* This safely compares two non-null terminated strings of arbitrary length */ int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd) { @@ -477,7 +517,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd, } #endif /*}}}*/ -// stringcasecmp - Arbitary case insensitive string compare /*{{{*/ +// stringcasecmp - Arbitrary case insensitive string compare /*{{{*/ // --------------------------------------------------------------------- /* */ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) @@ -618,11 +658,24 @@ string TimeRFC1123(time_t Date) // --------------------------------------------------------------------- /* This pulls full messages from the input FD into the message buffer. It assumes that messages will not pause during transit so no - fancy buffering is used. */ + fancy buffering is used. + + In particular: this reads blocks from the input until it believes + that it's run out of input text. Each block is terminated by a + double newline ('\n' followed by '\n'). As noted below, there is a + bug in this code: it assumes that all the blocks have been read if + it doesn't see additional text in the buffer after the last one is + parsed, which will cause it to lose blocks if the last block + coincides with the end of the buffer. + */ bool ReadMessages(int Fd, vector &List) { char Buffer[64000]; char *End = Buffer; + // Represents any left-over from the previous iteration of the + // parse loop. (i.e., if a message is split across the end + // of the buffer, it goes here) + string PartialMessage; while (1) { @@ -650,6 +703,7 @@ bool ReadMessages(int Fd, vector &List) // Pull the message out string Message(Buffer,I-Buffer); + PartialMessage += Message; // Fix up the buffer for (; I < End && *I == '\n'; I++); @@ -657,10 +711,32 @@ bool ReadMessages(int Fd, vector &List) memmove(Buffer,I,End-Buffer); I = Buffer; - List.push_back(Message); + List.push_back(PartialMessage); + PartialMessage.clear(); } - if (End == Buffer) - return true; + if (End != Buffer) + { + // If there's text left in the buffer, store it + // in PartialMessage and throw the rest of the buffer + // away. This allows us to handle messages that + // are longer than the static buffer size. + PartialMessage += string(Buffer, End); + End = Buffer; + } + else + { + // BUG ALERT: if a message block happens to end at a + // multiple of 64000 characters, this will cause it to + // terminate early, leading to a badly formed block and + // probably crashing the method. However, this is the only + // way we have to find the end of the message block. I have + // an idea of how to fix this, but it will require changes + // to the protocol (essentially to mark the beginning and + // end of the block). + // + // -- dburrows 2008-04-02 + return true; + } if (WaitFd(Fd) == false) return false; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 6ec2b78..53146ce 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -16,12 +16,11 @@ #ifndef STRUTL_H #define STRUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/strutl.h" -#endif + #include #include +#include #include #include #include @@ -38,7 +37,8 @@ using std::ostream; #define APT_FORMAT2 #define APT_FORMAT3 #endif - + +bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest); char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); bool ParseQuoteWord(const char *&String,string &Res); diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 234521e..ed76338 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -9,10 +9,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debindexfile.h" -#endif - #include #include #include @@ -320,6 +316,170 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const } /*}}}*/ +// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) : + pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section) +{ +} + /*}}}*/ +// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +inline string debTranslationsIndex::IndexFile(const char *Type) const +{ + return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); +} +string debTranslationsIndex::IndexURI(const char *Type) const +{ + string Res; + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Res = URI + Dist; + else + Res = URI; + } + else + Res = URI + "dists/" + Dist + '/' + Section + + "/i18n/Translation-"; + + Res += Type; + return Res; +} + /*}}}*/ +// TranslationsIndex::GetIndexes - Fetch the index files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const +{ + if (TranslationsAvailable()) { + string TranslationFile = "Translation-" + LanguageCode(); + new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()), + Info(TranslationFile.c_str()), + TranslationFile); + } + + return true; +} + /*}}}*/ +// TranslationsIndex::Describe - Give a descriptive path to the index /*{{{*/ +// --------------------------------------------------------------------- +/* This should help the user find the index in the sources.list and + in the filesystem for problem solving */ +string debTranslationsIndex::Describe(bool Short) const +{ + char S[300]; + if (Short == true) + snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str()); + else + snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(), + IndexFile(LanguageCode().c_str()).c_str()); + return S; +} + /*}}}*/ +// TranslationsIndex::Info - One liner describing the index URI /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debTranslationsIndex::Info(const char *Type) const +{ + string Info = ::URI::SiteOnly(URI) + ' '; + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Info += Dist; + } + else + Info += Dist + '/' + Section; + Info += " "; + Info += Type; + return Info; +} + /*}}}*/ +bool debTranslationsIndex::HasPackages() const +{ + if(!TranslationsAvailable()) + return false; + + return FileExists(IndexFile(LanguageCode().c_str())); +} + +// TranslationsIndex::Exists - Check if the index is available /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::Exists() const +{ + return FileExists(IndexFile(LanguageCode().c_str())); +} + /*}}}*/ +// TranslationsIndex::Size - Return the size of the index /*{{{*/ +// --------------------------------------------------------------------- +/* This is really only used for progress reporting. */ +unsigned long debTranslationsIndex::Size() const +{ + struct stat S; + if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0) + return 0; + return S.st_size; +} + /*}}}*/ +// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +{ + // Check the translation file, if in use + string TranslationFile = IndexFile(LanguageCode().c_str()); + if (TranslationsAvailable() && FileExists(TranslationFile)) + { + FileFd Trans(TranslationFile,FileFd::ReadOnly); + debListParser TransParser(&Trans); + if (_error->PendingError() == true) + return false; + + Prog.SubProgress(0, Info(TranslationFile.c_str())); + if (Gen.SelectFile(TranslationFile,string(),*this) == false) + return _error->Error("Problem with SelectFile %s",TranslationFile.c_str()); + + // Store the IMS information + pkgCache::PkgFileIterator TransFile = Gen.GetCurFile(); + struct stat TransSt; + if (fstat(Trans.Fd(),&TransSt) != 0) + return _error->Errno("fstat","Failed to stat"); + TransFile->Size = TransSt.st_size; + TransFile->mtime = TransSt.st_mtime; + + if (Gen.MergeList(TransParser) == false) + return _error->Error("Problem with MergeList %s",TranslationFile.c_str()); + } + + return true; +} + /*}}}*/ +// TranslationsIndex::FindInCache - Find this index /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const +{ + string FileName = IndexFile(LanguageCode().c_str()); + + pkgCache::PkgFileIterator File = Cache.FileBegin(); + for (; File.end() == false; File++) + { + if (FileName != File.FileName()) + continue; + + struct stat St; + if (stat(File.FileName(),&St) != 0) + return pkgCache::PkgFileIterator(Cache); + if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime) + return pkgCache::PkgFileIterator(Cache); + return File; + } + return File; +} + /*}}}*/ // StatusIndex::debStatusIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -416,6 +576,11 @@ class debIFTypePkg : public pkgIndexFile::Type }; debIFTypePkg() {Label = "Debian Package Index";}; }; +class debIFTypeTrans : public debIFTypePkg +{ + public: + debIFTypeTrans() {Label = "Debian Translation Index";}; +}; class debIFTypeStatus : public pkgIndexFile::Type { public: @@ -428,6 +593,7 @@ class debIFTypeStatus : public pkgIndexFile::Type }; static debIFTypeSrc _apt_Src; static debIFTypePkg _apt_Pkg; +static debIFTypeTrans _apt_Trans; static debIFTypeStatus _apt_Status; const pkgIndexFile::Type *debSourcesIndex::GetType() const @@ -438,6 +604,10 @@ const pkgIndexFile::Type *debPackagesIndex::GetType() const { return &_apt_Pkg; } +const pkgIndexFile::Type *debTranslationsIndex::GetType() const +{ + return &_apt_Trans; +} const pkgIndexFile::Type *debStatusIndex::GetType() const { return &_apt_Status; diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index a1b9583..b0012c9 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -16,9 +16,7 @@ #ifndef PKGLIB_DEBINDEXFILE_H #define PKGLIB_DEBINDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debindexfile.h" -#endif + #include @@ -74,6 +72,36 @@ class debPackagesIndex : public pkgIndexFile debPackagesIndex(string URI,string Dist,string Section,bool Trusted); }; +class debTranslationsIndex : public pkgIndexFile +{ + string URI; + string Dist; + string Section; + + string Info(const char *Type) const; + string IndexFile(const char *Type) const; + string IndexURI(const char *Type) const; + + inline string TranslationFile() const {return "Translation-" + LanguageCode();}; + + public: + + virtual const Type *GetType() const; + + // Interface for acquire + virtual string Describe(bool Short) const; + virtual bool GetIndexes(pkgAcquire *Owner) const; + + // Interface for the Cache Generator + virtual bool Exists() const; + virtual bool HasPackages() const; + virtual unsigned long Size() const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; + + debTranslationsIndex(string URI,string Dist,string Section); +}; + class debSourcesIndex : public pkgIndexFile { string URI; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index d0dc7a2..896d4d6 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include @@ -104,6 +105,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return false; if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false) return false; + if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false) + return false; if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) return false; @@ -117,6 +120,48 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return true; } /*}}}*/ +// ListParser::Description - Return the description string /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the string describing the package in debian + form. If this returns the blank string then the entry is assumed to + only describe package properties */ +string debListParser::Description() +{ + if (DescriptionLanguage().empty()) + return Section.FindS("Description"); + else + return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()); +} + /*}}}*/ +// ListParser::DescriptionLanguage - Return the description lang string /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the string describing the language of + description. If this returns the blank string then the entry is + assumed to describe original description. */ +string debListParser::DescriptionLanguage() +{ + return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : ""; +} + /*}}}*/ +// ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the md5 string to allow the check if it is the right + description. If no Description-md5 is found in the section it will be + calculated. + */ +MD5SumValue debListParser::Description_md5() +{ + string value = Section.FindS("Description-md5"); + + if (value.empty()) + { + MD5Summation md5; + md5.Add((Description() + "\n").c_str()); + return md5.Result(); + } else + return MD5SumValue(value); +} + /*}}}*/ // ListParser::UsePackage - Update a package structure /*{{{*/ // --------------------------------------------------------------------- /* This is called to update the package with any new information @@ -150,6 +195,7 @@ unsigned short debListParser::VersionHash() // "Suggests", // "Recommends", "Conflicts", + "Breaks", "Replaces",0}; unsigned long Result = INIT_FCS; char S[1024]; @@ -247,6 +293,8 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, {"installed",pkgCache::State::Installed}, {"half-installed",pkgCache::State::HalfInstalled}, {"config-files",pkgCache::State::ConfigFiles}, + {"triggers-awaited",pkgCache::State::TriggersAwaited}, + {"triggers-pending",pkgCache::State::TriggersPending}, {"post-inst-failed",pkgCache::State::HalfConfigured}, {"removal-failed",pkgCache::State::HalfInstalled}, {}}; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 3a0e042..34bb29c 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -12,6 +12,7 @@ #define PKGLIB_DEBLISTPARSER_H #include +#include #include class debListParser : public pkgCacheGenerator::ListParser @@ -47,6 +48,9 @@ class debListParser : public pkgCacheGenerator::ListParser virtual string Package(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); + virtual string Description(); + virtual string DescriptionLanguage(); + virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); virtual bool UsePackage(pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 85e5b16..ee03519 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -1,9 +1,5 @@ // ijones, walters -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debmetaindex.h" -#endif - #include #include #include @@ -148,15 +144,34 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const vector *targets = ComputeIndexTargets(); for (vector ::const_iterator Target = targets->begin(); Target != targets->end(); Target++) { new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ""); + (*Target)->ShortDesc, HashString()); } + // this is normally created in pkgAcqMetaSig, but if we run + // in --print-uris mode, we add it here + new pkgAcqMetaIndex(Owner, MetaIndexURI("Release"), + MetaIndexInfo("Release"), "Release", + MetaIndexURI("Release.gpg"), + ComputeIndexTargets(), + new indexRecords (Dist)); + } + new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg", MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release", ComputeIndexTargets(), new indexRecords (Dist)); + // Queue the translations + for (vector::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) { + + if((*I)->IsSrc) + continue; + debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section); + i.GetIndexes(Owner); + } + return true; } @@ -181,11 +196,16 @@ vector *debReleaseIndex::GetIndexFiles() Indexes = new vector ; for (vector::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) + I != SectionEntries.end(); I++) { if ((*I)->IsSrc) Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); else + { Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); + Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section)); + } + } + return Indexes; } @@ -213,7 +233,7 @@ class debSLTypeDebian : public pkgSourceList::Type // This check insures that there will be only one Release file // queued for all the Packages files and Sources files it // corresponds to. - if ((*I)->GetType() == "deb") + if (strcmp((*I)->GetType(), "deb") == 0) { debReleaseIndex *Deb = (debReleaseIndex *) (*I); // This check insures that there will be only one Release file diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 2b99229..c021a1b 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -2,10 +2,6 @@ #ifndef PKGLIB_DEBMETAINDEX_H #define PKGLIB_DEBMETAINDEX_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debmetaindex.h" -#endif - #include #include diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 6652a6a..8ed0bb7 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -8,11 +8,10 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debrecords.h" -#endif #include +#include #include +#include /*}}}*/ // RecordParser::debRecordParser - Constructor /*{{{*/ @@ -30,6 +29,10 @@ debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver) { return Tags.Jump(Section,Ver->Offset); +} +bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc) +{ + return Tags.Jump(Section,Desc->Offset); } /*}}}*/ // RecordParser::FileName - Return the archive filename on the site /*{{{*/ @@ -48,6 +51,14 @@ string debRecordParser::Name() return Section.FindS("Package"); } /*}}}*/ +// RecordParser::Homepage - Return the package homepage /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::Homepage() +{ + return Section.FindS("Homepage"); +} + /*}}}*/ // RecordParser::MD5Hash - Return the archive hash /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -61,7 +72,15 @@ string debRecordParser::MD5Hash() /* */ string debRecordParser::SHA1Hash() { - return Section.FindS("SHA1Sum"); + return Section.FindS("SHA1"); +} + /*}}}*/ +// RecordParser::SHA1Hash - Return the archive hash /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::SHA256Hash() +{ + return Section.FindS("SHA256"); } /*}}}*/ // RecordParser::Maintainer - Return the maintainer email /*{{{*/ @@ -77,7 +96,7 @@ string debRecordParser::Maintainer() /* */ string debRecordParser::ShortDesc() { - string Res = Section.FindS("Description"); + string Res = LongDesc(); string::size_type Pos = Res.find('\n'); if (Pos == string::npos) return Res; @@ -89,21 +108,60 @@ string debRecordParser::ShortDesc() /* */ string debRecordParser::LongDesc() { - return Section.FindS("Description"); + string orig, dest; + char *codeset = nl_langinfo(CODESET); + + if (!Section.FindS("Description").empty()) + orig = Section.FindS("Description").c_str(); + else + orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str(); + + if (strcmp(codeset,"UTF-8") != 0) { + UTF8ToCodeset(codeset, orig, &dest); + orig = dest; + } + + return orig; } /*}}}*/ + +static const char *SourceVerSeparators = " ()"; + // RecordParser::SourcePkg - Return the source package name if any /*{{{*/ // --------------------------------------------------------------------- /* */ string debRecordParser::SourcePkg() { string Res = Section.FindS("Source"); - string::size_type Pos = Res.find(' '); + string::size_type Pos = Res.find_first_of(SourceVerSeparators); if (Pos == string::npos) return Res; return string(Res,0,Pos); } /*}}}*/ +// RecordParser::SourceVer - Return the source version number if present /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::SourceVer() +{ + string Pkg = Section.FindS("Source"); + string::size_type Pos = Pkg.find_first_of(SourceVerSeparators); + if (Pos == string::npos) + return ""; + + string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos); + if(VerStart == string::npos) + return ""; + + string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart); + if(VerEnd == string::npos) + // Corresponds to the case of, e.g., "foo (1.2" without a closing + // paren. Be liberal and guess what it means. + return string(Pkg, VerStart); + else + return string(Pkg, VerStart, VerEnd - VerStart); +} + /*}}}*/ // RecordParser::GetRec - Return the whole record /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index efef2e5..6f358ab 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -14,11 +14,8 @@ #ifndef PKGLIB_DEBRECORDS_H #define PKGLIB_DEBRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debrecords.h" -#endif - #include +#include #include class debRecordParser : public pkgRecords::Parser @@ -30,6 +27,7 @@ class debRecordParser : public pkgRecords::Parser protected: virtual bool Jump(pkgCache::VerFileIterator const &Ver); + virtual bool Jump(pkgCache::DescFileIterator const &Desc); public: @@ -37,13 +35,16 @@ class debRecordParser : public pkgRecords::Parser virtual string FileName(); virtual string MD5Hash(); virtual string SHA1Hash(); + virtual string SHA256Hash(); virtual string SourcePkg(); + virtual string SourceVer(); // These are some general stats about the package virtual string Maintainer(); virtual string ShortDesc(); virtual string LongDesc(); virtual string Name(); + virtual string Homepage(); virtual void GetRec(const char *&Start,const char *&Stop); diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 9e87ee5..ace4e00 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -9,10 +9,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debsrcrecords.h" -#endif - #include #include #include @@ -40,7 +36,7 @@ const char **debSrcRecordParser::Binaries() { delete [] Buffer; // allocate new size based on buffer (but never smaller than 4000) - BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize)); + BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize)); Buffer = new char[BufSize]; } @@ -141,7 +137,7 @@ bool debSrcRecordParser::Files(vector &List) break; F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") { Pos = Tmp-1; continue; diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index f4e2cb4..8b1237c 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -11,9 +11,6 @@ #ifndef PKGLIB_DEBSRCRECORDS_H #define PKGLIB_DEBSRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsrcrecords.h" -#endif #include #include @@ -27,7 +24,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser char *StaticBinList[400]; unsigned long iOffset; char *Buffer; - unsigned long BufSize; + unsigned int BufSize; public: diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 2d805ea..11a84f1 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debsystem.h" -#endif - #include #include #include diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 84e57e7..5f9995e 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -10,10 +10,6 @@ #ifndef PKGLIB_DEBSYSTEM_H #define PKGLIB_DEBSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsystem.h" -#endif - #include class debStatusIndex; diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 064d8fa..ad45e9a 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -11,9 +11,6 @@ /*}}}*/ // Include Files /*{{{*/ #define APT_COMPATIBILITY 986 -#ifdef __GNUG__ -#pragma implementation "apt-pkg/debversion.h" -#endif #include #include diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index 00a8832..56fb678 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -12,9 +12,7 @@ #ifndef PKGLIB_DEBVERSION_H #define PKGLIB_DEBVERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debversion.h" -#endif + #include diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 475caeb..49951f8 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -8,36 +8,79 @@ ##################################################################### */ /*}}}*/ // Includes /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/dpkgpm.h" -#endif #include #include #include #include #include +#include +#include #include #include #include +#include #include #include #include #include #include +#include +#include #include #include +#include +#include +#include +#include +#include + #include #include /*}}}*/ using namespace std; +namespace +{ + // Maps the dpkg "processing" info to human readable names. Entry 0 + // of each array is the key, entry 1 is the value. + const std::pair PackageProcessingOps[] = { + std::make_pair("install", N_("Installing %s")), + std::make_pair("configure", N_("Configuring %s")), + std::make_pair("remove", N_("Removing %s")), + std::make_pair("trigproc", N_("Running post-installation trigger %s")) + }; + + const std::pair * const PackageProcessingOpsBegin = PackageProcessingOps; + const std::pair * const PackageProcessingOpsEnd = PackageProcessingOps + sizeof(PackageProcessingOps) / sizeof(PackageProcessingOps[0]); + + // Predicate to test whether an entry in the PackageProcessingOps + // array matches a string. + class MatchProcessingOp + { + const char *target; + + public: + MatchProcessingOp(const char *the_target) + : target(the_target) + { + } + + bool operator()(const std::pair &pair) const + { + return strcmp(pair.first, target) == 0; + } + }; +} + // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache) +pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) + : pkgPackageManager(Cache), dpkgbuf_pos(0), + term_out(NULL), PackagesDone(0), PackagesTotal(0) { } /*}}}*/ @@ -87,68 +130,6 @@ bool pkgDPkgPM::Remove(PkgIterator Pkg,bool Purge) return true; } /*}}}*/ -// DPkgPM::RunScripts - Run a set of scripts /*{{{*/ -// --------------------------------------------------------------------- -/* This looks for a list of script sto run from the configuration file, - each one is run with system from a forked child. */ -bool pkgDPkgPM::RunScripts(const char *Cnf) -{ - Configuration::Item const *Opts = _config->Tree(Cnf); - if (Opts == 0 || Opts->Child == 0) - return true; - Opts = Opts->Child; - - // Fork for running the system calls - pid_t Child = ExecFork(); - - // This is the child - if (Child == 0) - { - if (chdir("/tmp/") != 0) - _exit(100); - - unsigned int Count = 1; - for (; Opts != 0; Opts = Opts->Next, Count++) - { - if (Opts->Value.empty() == true) - continue; - - if (system(Opts->Value.c_str()) != 0) - _exit(100+Count); - } - _exit(0); - } - - // Wait for the child - int Status = 0; - while (waitpid(Child,&Status,0) != Child) - { - if (errno == EINTR) - continue; - return _error->Errno("waitpid","Couldn't wait for subprocess"); - } - - // Restore sig int/quit - signal(SIGQUIT,SIG_DFL); - signal(SIGINT,SIG_DFL); - - // Check for an error code. - if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) - { - unsigned int Count = WEXITSTATUS(Status); - if (Count > 100) - { - Count -= 100; - for (; Opts != 0 && Count != 1; Opts = Opts->Next, Count--); - _error->Error("Problem executing scripts %s '%s'",Cnf,Opts->Value.c_str()); - } - - return _error->Error("Sub-process returned an error code"); - } - - return true; -} - /*}}}*/ // DPkgPM::SendV2Pkgs - Send version 2 package info /*{{{*/ // --------------------------------------------------------------------- /* This is part of the helper script communication interface, it sends @@ -326,7 +307,277 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) return true; } + + /*}}}*/ +// DPkgPM::DoStdin - Read stdin and pass to slave pty /*{{{*/ +// --------------------------------------------------------------------- +/* +*/ +void pkgDPkgPM::DoStdin(int master) +{ + unsigned char input_buf[256] = {0,}; + ssize_t len = read(0, input_buf, sizeof(input_buf)); + if (len) + write(master, input_buf, len); + else + stdin_is_dev_null = true; +} + /*}}}*/ +// DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/ +// --------------------------------------------------------------------- +/* + * read the terminal pty and write log + */ +void pkgDPkgPM::DoTerminalPty(int master) +{ + unsigned char term_buf[1024] = {0,0, }; + + ssize_t len=read(master, term_buf, sizeof(term_buf)); + if(len == -1 && errno == EIO) + { + // this happens when the child is about to exit, we + // give it time to actually exit, otherwise we run + // into a race + usleep(500000); + return; + } + if(len <= 0) + return; + write(1, term_buf, len); + if(term_out) + fwrite(term_buf, len, sizeof(char), term_out); +} /*}}}*/ +// DPkgPM::ProcessDpkgStatusBuf /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) +{ + // the status we output + ostringstream status; + + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; + + + /* dpkg sends strings like this: + 'status: : ' + errors look like this: + 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + and conffile-prompt like this + 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + + Newer versions of dpkg sent also: + 'processing: install: pkg' + 'processing: configure: pkg' + 'processing: remove: pkg' + 'processing: trigproc: trigger' + + */ + char* list[5]; + // dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + if( list[0] == NULL || list[1] == NULL || list[2] == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + return; + } + char *pkg = list[1]; + char *action = _strstrip(list[2]); + + // 'processing' from dpkg looks like + // 'processing: action: pkg' + if(strncmp(list[0], "processing", strlen("processing")) == 0) + { + char s[200]; + char *pkg_or_trigger = _strstrip(list[2]); + action =_strstrip( list[1]); + const std::pair * const iter = + std::find_if(PackageProcessingOpsBegin, + PackageProcessingOpsEnd, + MatchProcessingOp(action)); + if(iter == PackageProcessingOpsEnd) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring unknwon action: " << action << std::endl; + return; + } + snprintf(s, sizeof(s), _(iter->second), pkg_or_trigger); + + status << "pmstatus:" << pkg_or_trigger + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + + if(strncmp(action,"error",strlen("error")) == 0) + { + status << "pmerror:" << list[1] + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + if(strncmp(action,"conffile",strlen("conffile")) == 0) + { + status << "pmconffile:" << list[1] + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + + vector &states = PackageOps[pkg]; + const char *next_action = NULL; + if(PackageOpsDone[pkg] < states.size()) + next_action = states[PackageOpsDone[pkg]].state; + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // only read the translation if there is actually a next + // action + const char *translation = _(states[PackageOpsDone[pkg]].str); + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + PackagesDone++; + // build the status str + status << "pmstatus:" << pkg + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; +} + +// DPkgPM::DoDpkgStatusFd /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) +{ + char *p, *q; + int len; + + len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos); + dpkgbuf_pos += len; + if(len <= 0) + return; + + // process line by line if we have a buffer + p = q = dpkgbuf; + while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL) + { + *q = 0; + ProcessDpkgStatusLine(OutStatusFd, p); + p=q+1; // continue with next line + } + + // now move the unprocessed bits (after the final \n that is now a 0x0) + // to the start and update dpkgbuf_pos + void *memrchr(void const *, int, size_t); + p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos); + if(p == NULL) + return; + + // we are interessted in the first char *after* 0x0 + p++; + + // move the unprocessed tail to the start and update pos + memmove(dpkgbuf, p, p-dpkgbuf); + dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p; +} + /*}}}*/ + +bool pkgDPkgPM::OpenLog() +{ + string logdir = _config->FindDir("Dir::Log"); + if(not FileExists(logdir)) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); + string logfile_name = flCombine(logdir, + _config->Find("Dir::Log::Terminal")); + if (!logfile_name.empty()) + { + term_out = fopen(logfile_name.c_str(),"a"); + chmod(logfile_name.c_str(), 0600); + // output current time + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "\nLog started: "); + fprintf(term_out, "%s", outstr); + fprintf(term_out, "\n"); + } + return true; +} + +bool pkgDPkgPM::CloseLog() +{ + if(term_out) + { + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log ended: "); + fprintf(term_out, "%s", outstr); + fprintf(term_out, "\n"); + fclose(term_out); + } + term_out = NULL; + return true; +} + +/*{{{*/ +// This implements a racy version of pselect for those architectures +// that don't have a working implementation. +// FIXME: Probably can be removed on Lenny+1 +static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const struct timespec *timeout, + const sigset_t *sigmask) +{ + sigset_t origmask; + struct timeval tv; + int retval; + + tv.tv_sec = timeout->tv_sec; + tv.tv_usec = timeout->tv_nsec/1000; + + sigprocmask(SIG_SETMASK, sigmask, &origmask); + retval = select(nfds, readfds, writefds, exceptfds, &tv); + sigprocmask(SIG_SETMASK, &origmask, 0); + return retval; +} +/*}}}*/ + // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- /* This globs the operations and calls dpkg @@ -340,19 +591,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) { unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); + bool NoTriggers = _config->FindB("DPkg::NoTriggers",false); if (RunScripts("DPkg::Pre-Invoke") == false) return false; if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; - - // prepare the progress reporting - int Done = 0; - int Total = 0; + // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) - static const struct DpkgState DpkgStatesOpMap[][5] = { + static const struct DpkgState DpkgStatesOpMap[][7] = { // Install operation { {"half-installed", N_("Preparing %s")}, @@ -363,12 +612,20 @@ bool pkgDPkgPM::Go(int OutStatusFd) { {"unpacked",N_("Preparing to configure %s") }, {"half-configured", N_("Configuring %s") }, +#if 0 + {"triggers-awaited", N_("Processing triggers for %s") }, + {"triggers-pending", N_("Processing triggers for %s") }, +#endif { "installed", N_("Installed %s")}, {NULL, NULL} }, // Remove operation { {"half-configured", N_("Preparing for removal of %s")}, +#if 0 + {"triggers-awaited", N_("Preparing for removal of %s")}, + {"triggers-pending", N_("Preparing for removal of %s")}, +#endif {"half-installed", N_("Removing %s")}, {"config-files", N_("Removed %s")}, {NULL, NULL} @@ -381,15 +638,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, }; - // the dpkg states that the pkg will run through, the string is - // the package, the vector contains the dpkg states that the package - // will go through - map > PackageOps; - // the dpkg states that are already done; the string is the package - // the int is the state that is already done (e.g. a package that is - // going to be install is already in state "half-installed") - map PackageOpsDone; - // init the PackageOps map, go over the list of packages that // that will be [installed|configured|removed|purged] and add // them to the PackageOps map (the dpkg states it goes through) @@ -401,10 +649,15 @@ bool pkgDPkgPM::Go(int OutStatusFd) for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) { PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); - Total++; + PackagesTotal++; } } + stdin_is_dev_null = false; + + // create log + OpenLog(); + // this loop is runs once per operation for (vector::iterator I = List.begin(); I != List.end();) { @@ -472,12 +725,16 @@ bool pkgDPkgPM::Go(int OutStatusFd) case Item::Configure: Args[n++] = "--configure"; + if (NoTriggers) + Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); break; case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); + Args[n++] = "--auto-deconfigure"; + Size += strlen(Args[n-1]); break; } @@ -523,7 +780,35 @@ bool pkgDPkgPM::Go(int OutStatusFd) it doesn't die but we do! So we must also ignore it */ sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); - + + // ignore SIGHUP as well (debian #463030) + 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) + { + const char *s = _("Can not write log, openpty() " + "failed (/dev/pts not mounted?)\n"); + fprintf(stderr, "%s",s); + fprintf(term_out, "%s",s); + master = slave = -1; + } else { + struct termios rtt; + rtt = tt; + cfmakeraw(&rtt); + rtt.c_lflag &= ~ECHO; + tcsetattr(0, TCSAFLUSH, &rtt); + } + // Fork dpkg pid_t Child; _config->Set("APT::Keep-Fds::",fd[1]); @@ -532,8 +817,18 @@ bool pkgDPkgPM::Go(int OutStatusFd) // This is the child if (Child == 0) { + if(slave >= 0 && master >= 0) + { + setsid(); + ioctl(slave, TIOCSCTTY, 0); + close(master); + dup2(slave, 0); + dup2(slave, 1); + dup2(slave, 2); + close(slave); + } close(fd[0]); // close the read end of the pipe - + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -552,10 +847,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (fcntl(STDIN_FILENO,F_SETFL,Flags & (~(long)O_NONBLOCK)) < 0) _exit(100); } - + + /* No Job Control Stop Env is a magic dpkg var that prevents it from using sigstop */ - putenv("DPKG_NO_TSTP=yes"); + putenv((char *)"DPKG_NO_TSTP=yes"); execvp(Args[0],(char **)Args); cerr << "Could not exec dpkg!" << endl; _exit(100); @@ -569,16 +865,22 @@ bool pkgDPkgPM::Go(int OutStatusFd) // we read from dpkg here int _dpkgin = fd[0]; - fcntl(_dpkgin, F_SETFL, O_NONBLOCK); close(fd[1]); // close the write end of the pipe - // the read buffers for the communication with dpkg - char line[1024] = {0,}; - char buf[2] = {0,0}; - // the result of the waitpid call int res; + if(slave > 0) + close(slave); + + // setups fds + fd_set rfds; + struct timespec tv; + sigset_t sigmask; + sigset_t original_sigmask; + sigemptyset(&sigmask); + sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask); + int select_ret; while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { // FIXME: move this to a function or something, looks ugly here @@ -590,129 +892,53 @@ bool pkgDPkgPM::Go(int OutStatusFd) // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); signal(SIGINT,old_SIGINT); + signal(SIGHUP,old_SIGHUP); return _error->Errno("waitpid","Couldn't wait for subprocess"); } - - // read a single char, make sure that the read can't block - // (otherwise we may leave zombies) - int len = read(_dpkgin, buf, 1); - // nothing to read, wait a bit for more - if(len <= 0) - { - usleep(1000); - continue; - } + // wait for input or output here + FD_ZERO(&rfds); + if (!stdin_is_dev_null) + FD_SET(0, &rfds); + FD_SET(_dpkgin, &rfds); + if(master >= 0) + FD_SET(master, &rfds); + tv.tv_sec = 1; + tv.tv_nsec = 0; + select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, + &tv, &original_sigmask); + if (select_ret < 0 && (errno == EINVAL || errno == ENOSYS)) + select_ret = racy_pselect(max(master, _dpkgin)+1, &rfds, NULL, + NULL, &tv, &original_sigmask); + if (select_ret == 0) + continue; + else if (select_ret < 0 && errno == EINTR) + continue; + else if (select_ret < 0) + { + perror("select() returned error"); + continue; + } - // sanity check (should never happen) - if(strlen(line) >= sizeof(line)-10) - { - _error->Error("got a overlong line from dpkg: '%s'",line); - line[0]=0; - } - // append to line, check if we got a complete line - strcat(line, buf); - if(buf[0] != '\n') - continue; - - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "got from dpkg '" << line << "'" << std::endl; - - // the status we output - ostringstream status; - - /* dpkg sends strings like this: - 'status: : ' - errors look like this: - 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data - and conffile-prompt like this - 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited - - */ - char* list[5]; - // dpkg sends multiline error messages sometimes (see - // #374195 for a example. we should support this by - // either patching dpkg to not send multiline over the - // statusfd or by rewriting the code here to deal with - // it. for now we just ignore it and not crash - TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); - char *pkg = list[1]; - char *action = _strstrip(list[2]); - if( pkg == NULL || action == NULL) - { - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "ignoring line: not enough ':'" << std::endl; - // reset the line buffer - line[0]=0; - continue; - } - - if(strncmp(action,"error",strlen("error")) == 0) - { - status << "pmerror:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } - if(strncmp(action,"conffile",strlen("conffile")) == 0) - { - status << "pmconffile:" << list[1] - << ":" << (Done/float(Total)*100.0) - << ":" << list[3] - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - line[0]=0; - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - continue; - } - - vector &states = PackageOps[pkg]; - const char *next_action = NULL; - if(PackageOpsDone[pkg] < states.size()) - next_action = states[PackageOpsDone[pkg]].state; - // check if the package moved to the next dpkg state - if(next_action && (strcmp(action, next_action) == 0)) - { - // only read the translation if there is actually a next - // action - const char *translation = _(states[PackageOpsDone[pkg]].str); - char s[200]; - snprintf(s, sizeof(s), translation, pkg); - - // we moved from one dpkg state to a new one, report that - PackageOpsDone[pkg]++; - Done++; - // build the status str - status << "pmstatus:" << pkg - << ":" << (Done/float(Total)*100.0) - << ":" << s - << endl; - if(OutStatusFd > 0) - write(OutStatusFd, status.str().c_str(), status.str().size()); - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "send: '" << status.str() << "'" << endl; - - } - if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) - std::clog << "(parsed from dpkg) pkg: " << pkg - << " action: " << action << endl; - - // reset the line buffer - line[0]=0; + if(master >= 0 && FD_ISSET(master, &rfds)) + DoTerminalPty(master); + if(master >= 0 && FD_ISSET(0, &rfds)) + DoStdin(master); + if(FD_ISSET(_dpkgin, &rfds)) + DoDpkgStatusFd(_dpkgin, OutStatusFd); } close(_dpkgin); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); signal(SIGINT,old_SIGINT); + signal(SIGHUP,old_SIGHUP); + + if(master >= 0) + { + tcsetattr(0, TCSAFLUSH, &tt); + close(master); + } // Check for an error code. if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) @@ -732,13 +958,19 @@ bool pkgDPkgPM::Go(int OutStatusFd) else _error->Error("Sub-process %s exited unexpectedly",Args[0]); - if(stopOnError) + if(stopOnError) + { + CloseLog(); return false; + } } } + CloseLog(); if (RunScripts("DPkg::Post-Invoke") == false) return false; + + Cache.writeStateFile(NULL); return true; } /*}}}*/ @@ -750,3 +982,165 @@ void pkgDPkgPM::Reset() List.erase(List.begin(),List.end()); } /*}}}*/ + +/* memrchr -- find the last occurrence of a byte in a memory block + + Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005, + 2006, 2007, 2008 Free Software Foundation, Inc. + + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#if defined _LIBC +# include +#else +# include +# define reg_char char +#endif + +#include +#include + +#undef __memrchr +#ifdef _LIBC +# undef memrchr +#endif + +#ifndef weak_alias +# define __memrchr memrchr +#endif + +/* Search no more than N bytes of S for C. */ +void * +__memrchr (void const *s, int c_in, size_t n) +{ + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; + + const unsigned char *char_ptr; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; + unsigned reg_char c; + + c = (unsigned char) c_in; + + /* Handle the last few bytes by reading one byte at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s + n; + n > 0 && (size_t) char_ptr % sizeof (longword) != 0; + --n) + if (*--char_ptr == c) + return (void *) char_ptr; + + longword_ptr = (const longword *) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to any size longwords. */ + + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) + { + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) + { + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } + } + } + + /* Instead of the traditional loop which tests each byte, we will test a + longword at a time. The tricky part is testing if *any of the four* + bytes in the longword in question are equal to c. We first use an xor + with repeated_c. This reduces the task to testing whether *any of the + four* bytes in longword1 is zero. + + We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + So, the test whether any byte in longword1 is zero is equivalent to + testing whether tmp is nonzero. */ + + while (n >= sizeof (longword)) + { + longword longword1 = *--longword_ptr ^ repeated_c; + + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) + { + longword_ptr++; + break; + } + n -= sizeof (longword); + } + + char_ptr = (const unsigned char *) longword_ptr; + + /* At this point, we know that either n < sizeof (longword), or one of the + sizeof (longword) bytes starting at char_ptr is == c. On little-endian + machines, we could determine the first such byte without any further + memory accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. Choose code + that works in both cases. */ + + while (n-- > 0) + { + if (*--char_ptr == c) + return (void *) char_ptr; + } + + return NULL; +} +#ifdef weak_alias +weak_alias (__memrchr, memrchr) +#endif diff --git a/apt-pkg/deb/dpkgpm.cc.orig b/apt-pkg/deb/dpkgpm.cc.orig new file mode 100644 index 0000000..5390af1 --- /dev/null +++ b/apt-pkg/deb/dpkgpm.cc.orig @@ -0,0 +1,1142 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: dpkgpm.cc,v 1.28 2004/01/27 02:25:01 mdz Exp $ +/* ###################################################################### + + DPKG Package Manager - Provide an interface to dpkg + + ##################################################################### */ + /*}}}*/ +// Includes /*{{{*/ +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + /*}}}*/ + +using namespace std; + +namespace +{ + // Maps the dpkg "processing" info to human readable names. Entry 0 + // of each array is the key, entry 1 is the value. + const std::pair PackageProcessingOps[] = { + std::make_pair("install", N_("Installing %s")), + std::make_pair("configure", N_("Configuring %s")), + std::make_pair("remove", N_("Removing %s")), + std::make_pair("trigproc", N_("Running post-installation trigger %s")) + }; + + const std::pair * const PackageProcessingOpsBegin = PackageProcessingOps; + const std::pair * const PackageProcessingOpsEnd = PackageProcessingOps + sizeof(PackageProcessingOps) / sizeof(PackageProcessingOps[0]); + + // Predicate to test whether an entry in the PackageProcessingOps + // array matches a string. + class MatchProcessingOp + { + const char *target; + + public: + MatchProcessingOp(const char *the_target) + : target(the_target) + { + } + + bool operator()(const std::pair &pair) const + { + return strcmp(pair.first, target) == 0; + } + }; +} + +// DPkgPM::pkgDPkgPM - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) + : pkgPackageManager(Cache), dpkgbuf_pos(0), + term_out(NULL), PackagesDone(0), PackagesTotal(0) +{ +} + /*}}}*/ +// DPkgPM::pkgDPkgPM - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgDPkgPM::~pkgDPkgPM() +{ +} + /*}}}*/ +// DPkgPM::Install - Install a package /*{{{*/ +// --------------------------------------------------------------------- +/* Add an install operation to the sequence list */ +bool pkgDPkgPM::Install(PkgIterator Pkg,string File) +{ + if (File.empty() == true || Pkg.end() == true) + return _error->Error("Internal Error, No file name for %s",Pkg.Name()); + + List.push_back(Item(Item::Install,Pkg,File)); + return true; +} + /*}}}*/ +// DPkgPM::Configure - Configure a package /*{{{*/ +// --------------------------------------------------------------------- +/* Add a configure operation to the sequence list */ +bool pkgDPkgPM::Configure(PkgIterator Pkg) +{ + if (Pkg.end() == true) + return false; + + List.push_back(Item(Item::Configure,Pkg)); + return true; +} + /*}}}*/ +// DPkgPM::Remove - Remove a package /*{{{*/ +// --------------------------------------------------------------------- +/* Add a remove operation to the sequence list */ +bool pkgDPkgPM::Remove(PkgIterator Pkg,bool Purge) +{ + if (Pkg.end() == true) + return false; + + if (Purge == true) + List.push_back(Item(Item::Purge,Pkg)); + else + List.push_back(Item(Item::Remove,Pkg)); + return true; +} + /*}}}*/ +// DPkgPM::SendV2Pkgs - Send version 2 package info /*{{{*/ +// --------------------------------------------------------------------- +/* This is part of the helper script communication interface, it sends + very complete information down to the other end of the pipe.*/ +bool pkgDPkgPM::SendV2Pkgs(FILE *F) +{ + fprintf(F,"VERSION 2\n"); + + /* Write out all of the configuration directives by walking the + configuration tree */ + const Configuration::Item *Top = _config->Tree(0); + for (; Top != 0;) + { + if (Top->Value.empty() == false) + { + fprintf(F,"%s=%s\n", + QuoteString(Top->FullTag(),"=\"\n").c_str(), + QuoteString(Top->Value,"\n").c_str()); + } + + if (Top->Child != 0) + { + Top = Top->Child; + continue; + } + + while (Top != 0 && Top->Next == 0) + Top = Top->Parent; + if (Top != 0) + Top = Top->Next; + } + fprintf(F,"\n"); + + // Write out the package actions in order. + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + pkgDepCache::StateCache &S = Cache[I->Pkg]; + + fprintf(F,"%s ",I->Pkg.Name()); + // Current version + if (I->Pkg->CurrentVer == 0) + fprintf(F,"- "); + else + fprintf(F,"%s ",I->Pkg.CurrentVer().VerStr()); + + // Show the compare operator + // Target version + if (S.InstallVer != 0) + { + int Comp = 2; + if (I->Pkg->CurrentVer != 0) + Comp = S.InstVerIter(Cache).CompareVer(I->Pkg.CurrentVer()); + if (Comp < 0) + fprintf(F,"> "); + if (Comp == 0) + fprintf(F,"= "); + if (Comp > 0) + fprintf(F,"< "); + fprintf(F,"%s ",S.InstVerIter(Cache).VerStr()); + } + else + fprintf(F,"> - "); + + // Show the filename/operation + if (I->Op == Item::Install) + { + // No errors here.. + if (I->File[0] != '/') + fprintf(F,"**ERROR**\n"); + else + fprintf(F,"%s\n",I->File.c_str()); + } + if (I->Op == Item::Configure) + fprintf(F,"**CONFIGURE**\n"); + if (I->Op == Item::Remove || + I->Op == Item::Purge) + fprintf(F,"**REMOVE**\n"); + + if (ferror(F) != 0) + return false; + } + return true; +} + /*}}}*/ +// DPkgPM::RunScriptsWithPkgs - Run scripts with package names on stdin /*{{{*/ +// --------------------------------------------------------------------- +/* This looks for a list of scripts to run from the configuration file + each one is run and is fed on standard input a list of all .deb files + that are due to be installed. */ +bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) +{ + Configuration::Item const *Opts = _config->Tree(Cnf); + if (Opts == 0 || Opts->Child == 0) + return true; + Opts = Opts->Child; + + unsigned int Count = 1; + for (; Opts != 0; Opts = Opts->Next, Count++) + { + if (Opts->Value.empty() == true) + continue; + + // Determine the protocol version + string OptSec = Opts->Value; + string::size_type Pos; + if ((Pos = OptSec.find(' ')) == string::npos || Pos == 0) + Pos = OptSec.length(); + OptSec = "DPkg::Tools::Options::" + string(Opts->Value.c_str(),Pos); + + unsigned int Version = _config->FindI(OptSec+"::Version",1); + + // Create the pipes + int Pipes[2]; + if (pipe(Pipes) != 0) + return _error->Errno("pipe","Failed to create IPC pipe to subprocess"); + SetCloseExec(Pipes[0],true); + SetCloseExec(Pipes[1],true); + + // Purified Fork for running the script + pid_t Process = ExecFork(); + if (Process == 0) + { + // Setup the FDs + dup2(Pipes[0],STDIN_FILENO); + SetCloseExec(STDOUT_FILENO,false); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDERR_FILENO,false); + + const char *Args[4]; + Args[0] = "/bin/sh"; + Args[1] = "-c"; + Args[2] = Opts->Value.c_str(); + Args[3] = 0; + execv(Args[0],(char **)Args); + _exit(100); + } + close(Pipes[0]); + FILE *F = fdopen(Pipes[1],"w"); + if (F == 0) + return _error->Errno("fdopen","Faild to open new FD"); + + // Feed it the filenames. + bool Die = false; + if (Version <= 1) + { + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + // Only deal with packages to be installed from .deb + if (I->Op != Item::Install) + continue; + + // No errors here.. + if (I->File[0] != '/') + continue; + + /* Feed the filename of each package that is pending install + into the pipe. */ + fprintf(F,"%s\n",I->File.c_str()); + if (ferror(F) != 0) + { + Die = true; + break; + } + } + } + else + Die = !SendV2Pkgs(F); + + fclose(F); + + // Clean up the sub process + if (ExecWait(Process,Opts->Value.c_str()) == false) + return _error->Error("Failure running script %s",Opts->Value.c_str()); + } + + return true; +} + + /*}}}*/ +// DPkgPM::DoStdin - Read stdin and pass to slave pty /*{{{*/ +// --------------------------------------------------------------------- +/* +*/ +void pkgDPkgPM::DoStdin(int master) +{ + unsigned char input_buf[256] = {0,}; + ssize_t len = read(0, input_buf, sizeof(input_buf)); + if (len) + write(master, input_buf, len); + else + stdin_is_dev_null = true; +} + /*}}}*/ +// DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/ +// --------------------------------------------------------------------- +/* + * read the terminal pty and write log + */ +void pkgDPkgPM::DoTerminalPty(int master) +{ + unsigned char term_buf[1024] = {0,0, }; + + ssize_t len=read(master, term_buf, sizeof(term_buf)); + if(len == -1 && errno == EIO) + { + // this happens when the child is about to exit, we + // give it time to actually exit, otherwise we run + // into a race + usleep(500000); + return; + } + if(len <= 0) + return; + write(1, term_buf, len); + if(term_out) + fwrite(term_buf, len, sizeof(char), term_out); +} + /*}}}*/ +// DPkgPM::ProcessDpkgStatusBuf /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) +{ + // the status we output + ostringstream status; + + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "got from dpkg '" << line << "'" << std::endl; + + + /* dpkg sends strings like this: + 'status: : ' + errors look like this: + 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + and conffile-prompt like this + 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited + + Newer versions of dpkg sent also: + 'processing: install: pkg' + 'processing: configure: pkg' + 'processing: remove: pkg' + 'processing: trigproc: trigger' + + */ + char* list[5]; + // dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + if( list[0] == NULL || list[1] == NULL || list[2] == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + return; + } + char *pkg = list[1]; + char *action = _strstrip(list[2]); + + // 'processing' from dpkg looks like + // 'processing: action: pkg' + if(strncmp(list[0], "processing", strlen("processing")) == 0) + { + char s[200]; + char *pkg_or_trigger = _strstrip(list[2]); + action =_strstrip( list[1]); + const std::pair * const iter = + std::find_if(PackageProcessingOpsBegin, + PackageProcessingOpsEnd, + MatchProcessingOp(action)); + if(iter == PackageProcessingOpsEnd) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring unknwon action: " << action << std::endl; + return; + } + snprintf(s, sizeof(s), _(iter->second), pkg_or_trigger); + + status << "pmstatus:" << pkg_or_trigger + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + + if(strncmp(action,"error",strlen("error")) == 0) + { + status << "pmerror:" << list[1] + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + if(strncmp(action,"conffile",strlen("conffile")) == 0) + { + status << "pmconffile:" << list[1] + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << list[3] + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + return; + } + + vector &states = PackageOps[pkg]; + const char *next_action = NULL; + if(PackageOpsDone[pkg] < states.size()) + next_action = states[PackageOpsDone[pkg]].state; + // check if the package moved to the next dpkg state + if(next_action && (strcmp(action, next_action) == 0)) + { + // only read the translation if there is actually a next + // action + const char *translation = _(states[PackageOpsDone[pkg]].str); + char s[200]; + snprintf(s, sizeof(s), translation, pkg); + + // we moved from one dpkg state to a new one, report that + PackageOpsDone[pkg]++; + PackagesDone++; + // build the status str + status << "pmstatus:" << pkg + << ":" << (PackagesDone/float(PackagesTotal)*100.0) + << ":" << s + << endl; + if(OutStatusFd > 0) + write(OutStatusFd, status.str().c_str(), status.str().size()); + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "send: '" << status.str() << "'" << endl; + } + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "(parsed from dpkg) pkg: " << pkg + << " action: " << action << endl; +} + +// DPkgPM::DoDpkgStatusFd /*{{{*/ +// --------------------------------------------------------------------- +/* + */ +void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) +{ + char *p, *q; + int len; + + len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos); + dpkgbuf_pos += len; + if(len <= 0) + return; + + // process line by line if we have a buffer + p = q = dpkgbuf; + while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL) + { + *q = 0; + ProcessDpkgStatusLine(OutStatusFd, p); + p=q+1; // continue with next line + } + + // now move the unprocessed bits (after the final \n that is now a 0x0) + // to the start and update dpkgbuf_pos + void *memrchr(void const *, int, size_t); + p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos); + if(p == NULL) + return; + + // we are interessted in the first char *after* 0x0 + p++; + + // move the unprocessed tail to the start and update pos + memmove(dpkgbuf, p, p-dpkgbuf); + dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p; +} + /*}}}*/ + +bool pkgDPkgPM::OpenLog() +{ + string logdir = _config->FindDir("Dir::Log"); + if(not FileExists(logdir)) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); + string logfile_name = flCombine(logdir, + _config->Find("Dir::Log::Terminal")); + if (!logfile_name.empty()) + { + term_out = fopen(logfile_name.c_str(),"a"); + chmod(logfile_name.c_str(), 0600); + // output current time + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "\nLog started: "); + fprintf(term_out, "%s", outstr); + fprintf(term_out, "\n"); + } + return true; +} + +bool pkgDPkgPM::CloseLog() +{ + if(term_out) + { + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log ended: "); + fprintf(term_out, "%s", outstr); + fprintf(term_out, "\n"); + fclose(term_out); + } + term_out = NULL; + return true; +} + +/*{{{*/ +// This implements a racy version of pselect for those architectures +// that don't have a working implementation. +// FIXME: Probably can be removed on Lenny+1 +static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, const struct timespec *timeout, + const sigset_t *sigmask) +{ + sigset_t origmask; + struct timeval tv; + int retval; + + tv.tv_sec = timeout->tv_sec; + tv.tv_usec = timeout->tv_nsec/1000; + + sigprocmask(SIG_SETMASK, sigmask, &origmask); + retval = select(nfds, readfds, writefds, exceptfds, &tv); + sigprocmask(SIG_SETMASK, &origmask, 0); + return retval; +} +/*}}}*/ + +// DPkgPM::Go - Run the sequence /*{{{*/ +// --------------------------------------------------------------------- +/* This globs the operations and calls dpkg + * + * If it is called with "OutStatusFd" set to a valid file descriptor + * apt will report the install progress over this fd. It maps the + * dpkg states a package goes through to human readable (and i10n-able) + * names and calculates a percentage for each step. +*/ +bool pkgDPkgPM::Go(int OutStatusFd) +{ + unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); + unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); + bool NoTriggers = _config->FindB("DPkg::NoTriggers",false); + + if (RunScripts("DPkg::Pre-Invoke") == false) + return false; + + if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) + return false; + + // map the dpkg states to the operations that are performed + // (this is sorted in the same way as Item::Ops) + static const struct DpkgState DpkgStatesOpMap[][7] = { + // Install operation + { + {"half-installed", N_("Preparing %s")}, + {"unpacked", N_("Unpacking %s") }, + {NULL, NULL} + }, + // Configure operation + { + {"unpacked",N_("Preparing to configure %s") }, + {"half-configured", N_("Configuring %s") }, +#if 0 + {"triggers-awaited", N_("Processing triggers for %s") }, + {"triggers-pending", N_("Processing triggers for %s") }, +#endif + { "installed", N_("Installed %s")}, + {NULL, NULL} + }, + // Remove operation + { + {"half-configured", N_("Preparing for removal of %s")}, +#if 0 + {"triggers-awaited", N_("Preparing for removal of %s")}, + {"triggers-pending", N_("Preparing for removal of %s")}, +#endif + {"half-installed", N_("Removing %s")}, + {"config-files", N_("Removed %s")}, + {NULL, NULL} + }, + // Purge operation + { + {"config-files", N_("Preparing to completely remove %s")}, + {"not-installed", N_("Completely removed %s")}, + {NULL, NULL} + }, + }; + + // init the PackageOps map, go over the list of packages that + // that will be [installed|configured|removed|purged] and add + // them to the PackageOps map (the dpkg states it goes through) + // and the PackageOpsTranslations (human readable strings) + for (vector::iterator I = List.begin(); I != List.end();I++) + { + string name = (*I).Pkg.Name(); + PackageOpsDone[name] = 0; + for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) + { + PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); + PackagesTotal++; + } + } + + stdin_is_dev_null = false; + + // create log + OpenLog(); + + // this loop is runs once per operation + for (vector::iterator I = List.begin(); I != List.end();) + { + vector::iterator J = I; + for (; J != List.end() && J->Op == I->Op; J++); + + // Generate the argument list + const char *Args[MaxArgs + 50]; + if (J - I > (signed)MaxArgs) + J = I + MaxArgs; + + unsigned int n = 0; + unsigned long Size = 0; + string Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); + Args[n++] = Tmp.c_str(); + Size += strlen(Args[n-1]); + + // Stick in any custom dpkg options + Configuration::Item const *Opts = _config->Tree("DPkg::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args[n++] = Opts->Value.c_str(); + Size += Opts->Value.length(); + } + } + + char status_fd_buf[20]; + int fd[2]; + pipe(fd); + + Args[n++] = "--status-fd"; + Size += strlen(Args[n-1]); + snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]); + Args[n++] = status_fd_buf; + Size += strlen(Args[n-1]); + + switch (I->Op) + { + case Item::Remove: + Args[n++] = "--force-depends"; + Size += strlen(Args[n-1]); + Args[n++] = "--force-remove-essential"; + Size += strlen(Args[n-1]); + Args[n++] = "--remove"; + Size += strlen(Args[n-1]); + break; + + case Item::Purge: + Args[n++] = "--force-depends"; + Size += strlen(Args[n-1]); + Args[n++] = "--force-remove-essential"; + Size += strlen(Args[n-1]); + Args[n++] = "--purge"; + Size += strlen(Args[n-1]); + break; + + case Item::Configure: + Args[n++] = "--configure"; + if (NoTriggers) + Args[n++] = "--no-triggers"; + Size += strlen(Args[n-1]); + break; + + case Item::Install: + Args[n++] = "--unpack"; + Size += strlen(Args[n-1]); + Args[n++] = "--auto-deconfigure"; + Size += strlen(Args[n-1]); + break; + } + + // Write in the file or package names + if (I->Op == Item::Install) + { + for (;I != J && Size < MaxArgBytes; I++) + { + if (I->File[0] != '/') + return _error->Error("Internal Error, Pathname to install is not absolute '%s'",I->File.c_str()); + Args[n++] = I->File.c_str(); + Size += strlen(Args[n-1]); + } + } + else + { + for (;I != J && Size < MaxArgBytes; I++) + { + Args[n++] = I->Pkg.Name(); + Size += strlen(Args[n-1]); + } + } + Args[n] = 0; + J = I; + + if (_config->FindB("Debug::pkgDPkgPM",false) == true) + { + for (unsigned int k = 0; k != n; k++) + clog << Args[k] << ' '; + clog << endl; + continue; + } + + cout << flush; + clog << flush; + cerr << flush; + + typedef void (*sighandler_t)(int); + + /* Mask off sig int/quit. We do this because dpkg also does when + it forks scripts. What happens is that when you hit ctrl-c it sends + it to all processes in the group. Since dpkg ignores the signal + it doesn't die but we do! So we must also ignore it */ + sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN); + sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN); + + // ignore SIGHUP as well (debian #463030) + 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) + { + const char *s = _("Can not write log, openpty() " + "failed (/dev/pts not mounted?)\n"); + fprintf(stderr, "%s",s); + fprintf(term_out, "%s",s); + master = slave = -1; + } else { + struct termios rtt; + rtt = tt; + cfmakeraw(&rtt); + rtt.c_lflag &= ~ECHO; + tcsetattr(0, TCSAFLUSH, &rtt); + } + + // Fork dpkg + pid_t Child; + _config->Set("APT::Keep-Fds::",fd[1]); + Child = ExecFork(); + + // This is the child + if (Child == 0) + { + if(slave >= 0 && master >= 0) + { + setsid(); + ioctl(slave, TIOCSCTTY, 0); + close(master); + dup2(slave, 0); + dup2(slave, 1); + dup2(slave, 2); + close(slave); + } + close(fd[0]); // close the read end of the pipe + + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) + _exit(100); + + if (_config->FindB("DPkg::FlushSTDIN",true) == true && isatty(STDIN_FILENO)) + { + int Flags,dummy; + if ((Flags = fcntl(STDIN_FILENO,F_GETFL,dummy)) < 0) + _exit(100); + + // Discard everything in stdin before forking dpkg + if (fcntl(STDIN_FILENO,F_SETFL,Flags | O_NONBLOCK) < 0) + _exit(100); + + while (read(STDIN_FILENO,&dummy,1) == 1); + + if (fcntl(STDIN_FILENO,F_SETFL,Flags & (~(long)O_NONBLOCK)) < 0) + _exit(100); + } + + + /* No Job Control Stop Env is a magic dpkg var that prevents it + from using sigstop */ + putenv((char *)"DPKG_NO_TSTP=yes"); + execvp(Args[0],(char **)Args); + cerr << "Could not exec dpkg!" << endl; + _exit(100); + } + + // clear the Keep-Fd again + _config->Clear("APT::Keep-Fds",fd[1]); + + // Wait for dpkg + int Status = 0; + + // we read from dpkg here + int _dpkgin = fd[0]; + close(fd[1]); // close the write end of the pipe + + // the result of the waitpid call + int res; + if(slave > 0) + close(slave); + + // setups fds + fd_set rfds; + struct timespec tv; + sigset_t sigmask; + sigset_t original_sigmask; + sigemptyset(&sigmask); + sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask); + + int select_ret; + while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { + if(res < 0) { + // FIXME: move this to a function or something, looks ugly here + // error handling, waitpid returned -1 + if (errno == EINTR) + continue; + RunScripts("DPkg::Post-Invoke"); + + // Restore sig int/quit + signal(SIGQUIT,old_SIGQUIT); + signal(SIGINT,old_SIGINT); + signal(SIGHUP,old_SIGHUP); + return _error->Errno("waitpid","Couldn't wait for subprocess"); + } + + // wait for input or output here + FD_ZERO(&rfds); + if (!stdin_is_dev_null) + FD_SET(0, &rfds); + FD_SET(_dpkgin, &rfds); + if(master >= 0) + FD_SET(master, &rfds); + tv.tv_sec = 1; + tv.tv_nsec = 0; + select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, + &tv, &original_sigmask); + if (select_ret < 0 && (errno == EINVAL || errno == ENOSYS)) + select_ret = racy_pselect(max(master, _dpkgin)+1, &rfds, NULL, + NULL, &tv, &original_sigmask); + if (select_ret == 0) + continue; + else if (select_ret < 0 && errno == EINTR) + continue; + else if (select_ret < 0) + { + perror("select() returned error"); + continue; + } + + if(master >= 0 && FD_ISSET(master, &rfds)) + DoTerminalPty(master); + if(master >= 0 && FD_ISSET(0, &rfds)) + DoStdin(master); + if(FD_ISSET(_dpkgin, &rfds)) + DoDpkgStatusFd(_dpkgin, OutStatusFd); + } + close(_dpkgin); + + // Restore sig int/quit + signal(SIGQUIT,old_SIGQUIT); + signal(SIGINT,old_SIGINT); + signal(SIGHUP,old_SIGHUP); + + if(master >= 0) + { + tcsetattr(0, TCSAFLUSH, &tt); + close(master); + } + + // Check for an error code. + if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) + { + // if it was set to "keep-dpkg-runing" then we won't return + // here but keep the loop going and just report it as a error + // for later + bool stopOnError = _config->FindB("Dpkg::StopOnError",true); + + if(stopOnError) + RunScripts("DPkg::Post-Invoke"); + + if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) + _error->Error("Sub-process %s received a segmentation fault.",Args[0]); + else if (WIFEXITED(Status) != 0) + _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + else + _error->Error("Sub-process %s exited unexpectedly",Args[0]); + + if(stopOnError) + { + CloseLog(); + return false; + } + } + } + CloseLog(); + + if (RunScripts("DPkg::Post-Invoke") == false) + return false; + + Cache.writeStateFile(NULL); + return true; +} + /*}}}*/ +// pkgDpkgPM::Reset - Dump the contents of the command list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgDPkgPM::Reset() +{ + List.erase(List.begin(),List.end()); +} + /*}}}*/ + +/* memrchr -- find the last occurrence of a byte in a memory block + + Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005, + 2006, 2007, 2008 Free Software Foundation, Inc. + + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#if defined _LIBC +# include +#else +# include +# define reg_char char +#endif + +#include +#include + +#undef __memrchr +#ifdef _LIBC +# undef memrchr +#endif + +#ifndef weak_alias +# define __memrchr memrchr +#endif + +/* Search no more than N bytes of S for C. */ +void * +__memrchr (void const *s, int c_in, size_t n) +{ + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; + + const unsigned char *char_ptr; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; + unsigned reg_char c; + + c = (unsigned char) c_in; + + /* Handle the last few bytes by reading one byte at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s + n; + n > 0 && (size_t) char_ptr % sizeof (longword) != 0; + --n) + if (*--char_ptr == c) + return (void *) char_ptr; + + longword_ptr = (const longword *) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to any size longwords. */ + + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) + { + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) + { + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } + } + } + + /* Instead of the traditional loop which tests each byte, we will test a + longword at a time. The tricky part is testing if *any of the four* + bytes in the longword in question are equal to c. We first use an xor + with repeated_c. This reduces the task to testing whether *any of the + four* bytes in longword1 is zero. + + We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + So, the test whether any byte in longword1 is zero is equivalent to + testing whether tmp is nonzero. */ + + while (n >= sizeof (longword)) + { + longword longword1 = *--longword_ptr ^ repeated_c; + + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) + { + longword_ptr++; + break; + } + n -= sizeof (longword); + } + + char_ptr = (const unsigned char *) longword_ptr; + + /* At this point, we know that either n < sizeof (longword), or one of the + sizeof (longword) bytes starting at char_ptr is == c. On little-endian + machines, we could determine the first such byte without any further + memory accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. Choose code + that works in both cases. */ + + while (n-- > 0) + { + if (*--char_ptr == c) + return (void *) char_ptr; + } + + return NULL; +} +#ifdef weak_alias +weak_alias (__memrchr, memrchr) +#endif diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 2ff8a9a..ebc7e32 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -10,27 +10,47 @@ #ifndef PKGLIB_DPKGPM_H #define PKGLIB_DPKGPM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgpm.h" -#endif - #include #include +#include #include using std::vector; +using std::map; + class pkgDPkgPM : public pkgPackageManager { + private: + + bool stdin_is_dev_null; + + // the buffer we use for the dpkg status-fd reading + char dpkgbuf[1024]; + int dpkgbuf_pos; + FILE *term_out; + protected: - // used for progress reporting + // progress reporting struct DpkgState { const char *state; // the dpkg state (e.g. "unpack") const char *str; // the human readable translation of the state }; - + + // the dpkg states that the pkg will run through, the string is + // the package, the vector contains the dpkg states that the package + // will go through + map > PackageOps; + // the dpkg states that are already done; the string is the package + // the int is the state that is already done (e.g. a package that is + // going to be install is already in state "half-installed") + map PackageOpsDone; + // progress reporting + unsigned int PackagesDone; + unsigned int PackagesTotal; + struct Item { enum Ops {Install, Configure, Remove, Purge} Op; @@ -44,10 +64,19 @@ class pkgDPkgPM : public pkgPackageManager vector List; // Helpers - bool RunScripts(const char *Cnf); bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); + + // dpkg log + bool OpenLog(); + bool CloseLog(); + // input processing + void DoStdin(int master); + void DoTerminalPty(int master); + void DoDpkgStatusFd(int statusfd, int OutStatusFd); + void ProcessDpkgStatusLine(int OutStatusFd, char *line); + // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 58d1d25..2411bfe 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -8,24 +8,80 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/depcache.h" -#endif #include #include #include #include #include + +#include #include +#include +#include + +#include +#include +#include + +#include #include - /*}}}*/ + +// helper for Install-Recommends-Sections and Never-MarkAuto-Sections +static bool +ConfigValueInSubTree(const char* SubTree, const char *needle) +{ + Configuration::Item const *Opts; + Opts = _config->Tree(SubTree); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + if (strcmp(needle, Opts->Value.c_str()) == 0) + return true; + } + } + return false; +} + + +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : + cache(cache), released(false) +{ + ++cache.group_level; +} + +void pkgDepCache::ActionGroup::release() +{ + if(!released) + { + if(cache.group_level == 0) + std::cerr << "W: Unbalanced action groups, expect badness" << std::endl; + else + { + --cache.group_level; + + if(cache.group_level == 0) + cache.MarkAndSweep(); + } + + released = false; + } +} + +pkgDepCache::ActionGroup::~ActionGroup() +{ + release(); +} // DepCache::pkgDepCache - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) : - Cache(pCache), PkgState(0), DepState(0) + group_level(0), Cache(pCache), PkgState(0), DepState(0) { delLocalPolicy = 0; LocalPolicy = Plcy; @@ -48,6 +104,10 @@ pkgDepCache::~pkgDepCache() /* This allocats the extension buffers and initializes them. */ bool pkgDepCache::Init(OpProgress *Prog) { + // Suppress mark updates during this operation (just in case) and + // run a mark operation when Init terminates. + ActionGroup actions(*this); + delete [] PkgState; delete [] DepState; PkgState = new StateCache[Head().PackageCount]; @@ -73,7 +133,7 @@ bool pkgDepCache::Init(OpProgress *Prog) // Find the proper cache slot StateCache &State = PkgState[I->ID]; State.iFlags = 0; - + // Figure out the install version State.CandidateVer = GetCandidateVer(I); State.InstallVer = I.CurrentVer(); @@ -95,11 +155,133 @@ bool pkgDepCache::Init(OpProgress *Prog) if(Prog != 0) Prog->Done(); - + return true; } /*}}}*/ +bool pkgDepCache::readStateFile(OpProgress *Prog) +{ + FileFd state_file; + string state = _config->FindDir("Dir::State") + "extended_states"; + if(FileExists(state)) { + state_file.Open(state, FileFd::ReadOnly); + int file_size = state_file.Size(); + if(Prog != NULL) + Prog->OverallProgress(0, file_size, 1, + _("Reading state information")); + + pkgTagFile tagfile(&state_file); + pkgTagSection section; + int amt=0; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + // Silently ignore unknown packages and packages with no actual + // version. + if(!pkg.end() && !pkg.VersionList().end()) { + short reason = section.FindI("Auto-Installed", 0); + if(reason > 0) + PkgState[pkg->ID].Flags |= Flag::Auto; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Auto-Installed : " << pkgname << std::endl; + amt+=section.size(); + if(Prog != NULL) + Prog->OverallProgress(amt, file_size, 1, + _("Reading state information")); + } + if(Prog != NULL) + Prog->OverallProgress(file_size, file_size, 1, + _("Reading state information")); + } + } + + return true; +} + +bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) +{ + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "pkgDepCache::writeStateFile()" << std::endl; + + FileFd StateFile; + string state = _config->FindDir("Dir::State") + "extended_states"; + + // if it does not exist, create a empty one + if(!FileExists(state)) + { + StateFile.Open(state, FileFd::WriteEmpty); + StateFile.Close(); + } + + // open it + if(!StateFile.Open(state, FileFd::ReadOnly)) + return _error->Error(_("Failed to open StateFile %s"), + state.c_str()); + + FILE *OutFile; + string outfile = state + ".tmp"; + if((OutFile = fopen(outfile.c_str(),"w")) == NULL) + return _error->Error(_("Failed to write temporary StateFile %s"), + outfile.c_str()); + + // first merge with the existing sections + pkgTagFile tagfile(&StateFile); + pkgTagSection section; + std::set pkgs_seen; + const char *nullreorderlist[] = {0}; + while(tagfile.Step(section)) { + string pkgname = section.FindS("Package"); + // Silently ignore unknown packages and packages with no actual + // version. + pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + if(pkg.end() || pkg.VersionList().end()) + continue; + bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::clog << "Update exisiting AutoInstall info: " + << pkg.Name() << std::endl; + TFRewriteData rewrite[2]; + rewrite[0].Tag = "Auto-Installed"; + rewrite[0].Rewrite = newAuto ? "1" : "0"; + rewrite[0].NewTag = 0; + rewrite[1].Tag = 0; + TFRewrite(OutFile, section, nullreorderlist, rewrite); + fprintf(OutFile,"\n"); + pkgs_seen.insert(pkgname); + } + + // then write the ones we have not seen yet + std::ostringstream ostr; + 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)) + 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)) + std::clog << "Writing new AutoInstall: " + << pkg.Name() << std::endl; + ostr.str(string("")); + ostr << "Package: " << pkg.Name() + << "\nAuto-Installed: 1\n\n"; + fprintf(OutFile,"%s",ostr.str().c_str()); + fprintf(OutFile,"\n"); + } + } + fclose(OutFile); + + // move the outfile over the real file and set permissions + rename(outfile.c_str(), state.c_str()); + chmod(state.c_str(), 0644); + + return true; +} + // DepCache::CheckDep - Checks a single dependency /*{{{*/ // --------------------------------------------------------------------- /* This first checks the dependency against the main target package and @@ -114,7 +296,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ if (Dep.TargetPkg() != Dep.ParentPkg() || - (Dep->Type != Dep::Conflicts && Dep->Type != Dep::Obsoletes)) + (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); // Check the base package @@ -144,7 +326,8 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) { /* Provides may never be applied against the same package if it is a conflicts. See the comment above. */ - if (P.OwnerPkg() == Pkg && Dep->Type == Dep::Conflicts) + if (P.OwnerPkg() == Pkg && + (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks)) continue; // Check if the provides is a hit @@ -240,9 +423,11 @@ void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add) { StateCache &State = PkgState[Pkg->ID]; - // The Package is broken + // The Package is broken (either minimal dep or policy dep) if ((State.DepState & DepInstMin) != DepInstMin) iBrokenCount += Add; + if ((State.DepState & DepInstPolicy) != DepInstPolicy) + iPolicyBrokenCount += Add; // Bad state if (Pkg.State() != PkgIterator::NeedsNothing) @@ -296,7 +481,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) /* Invert for Conflicts. We have to do this twice to get the right sense for a conflicts group */ - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; // Add to the group if we are within an or.. @@ -307,7 +494,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -440,7 +629,9 @@ void pkgDepCache::Update(OpProgress *Prog) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -453,12 +644,14 @@ void pkgDepCache::Update(OpProgress *Prog) if (Prog != 0) Prog->Progress(Done); + + readStateFile(Prog); } /*}}}*/ // DepCache::Update - Update the deps list of a package /*{{{*/ // --------------------------------------------------------------------- /* This is a helper for update that only does the dep portion of the scan. - It is mainly ment to scan reverse dependencies. */ + It is mainly meant to scan reverse dependencies. */ void pkgDepCache::Update(DepIterator D) { // Update the reverse deps @@ -468,7 +661,9 @@ void pkgDepCache::Update(DepIterator D) State = DependencyState(D); // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; RemoveStates(D.ParentPkg()); @@ -510,7 +705,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg) // DepCache::MarkKeep - Put the package in the keep state /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) { // Simplifies other routines. if (Pkg.end() == true) @@ -522,6 +717,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) Pkg.CurrentVer().Downloadable() == false) return; + /** \todo Can this be moved later in the method? */ + ActionGroup group(*this); + /* We changed the soft state all the time so the UI is a bit nicer to use */ StateCache &P = PkgState[Pkg->ID]; @@ -537,8 +735,17 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) // We dont even try to keep virtual packages.. if (Pkg->VersionList == 0) return; - - P.Flags &= ~Flag::Auto; +#if 0 // reseting the autoflag here means we lose the + // auto-mark information if a user selects a package for removal + // but changes his mind then and sets it for keep again + // - this makes sense as default when all Garbage dependencies + // are automatically marked for removal (as aptitude does). + // setting a package for keep then makes it no longer autoinstalled + // for all other use-case this action is rather suprising + if(FromUser && !P.Marked) + P.Flags &= ~Flag::Auto; +#endif + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -564,6 +771,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) if (Pkg.end() == true) return; + ActionGroup group(*this); + // Check that it is not already marked for delete StateCache &P = PkgState[Pkg->ID]; P.iFlags &= ~(AutoKept | Purge); @@ -586,7 +795,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) else P.Mode = ModeDelete; P.InstallVer = 0; - P.Flags &= Flag::Auto; AddStates(Pkg); Update(Pkg); @@ -597,7 +805,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, - unsigned long Depth) + unsigned long Depth, bool FromUser, + bool ForceImportantDeps) { if (Depth > 100) return; @@ -606,26 +815,27 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (Pkg.end() == true) return; + ActionGroup group(*this); + /* Check that it is not already marked for install and that it can be installed */ StateCache &P = PkgState[Pkg->ID]; P.iFlags &= ~AutoKept; - if (P.InstBroken() == false && (P.Mode == ModeInstall || + if ((P.InstPolicyBroken() == false && P.InstBroken() == false) && + (P.Mode == ModeInstall || P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) - MarkKeep(Pkg); + MarkKeep(Pkg, false, FromUser); return; } // See if there is even any possible instalation candidate if (P.CandidateVer == 0) return; - // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) 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 */ @@ -634,7 +844,20 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.Mode = ModeInstall; P.InstallVer = P.CandidateVer; - P.Flags &= ~Flag::Auto; + + if(FromUser) + { + // Set it to manual if it's a new install or cancelling the + // removal of a garbage package. + if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked)) + P.Flags &= ~Flag::Auto; + } + else + { + // Set it to auto if this is a new install. + if(P.Status == 2) + P.Flags |= Flag::Auto; + } if (P.CandidateVer == (Version *)Pkg.CurrentVer()) P.Mode = ModeKeep; @@ -666,10 +889,66 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* Check if this dep should be consider for install. If it is a user defined important dep and we are installed a new package then - it will be installed. Otherwise we only worry about critical deps */ + it will be installed. Otherwise we only check for important + deps that have changed from the installed version + */ if (IsImportantDep(Start) == false) continue; - if (Pkg->CurrentVer != 0 && Start.IsCritical() == false) + + /* Check if any ImportantDep() (but not Critical) were added + * since we installed the package. Also check for deps that + * were satisfied in the past: for instance, if a version + * restriction in a Recommends was tightened, upgrading the + * package should follow that Recommends rather than causing the + * dependency to be removed. (bug #470115) + */ + bool isNewImportantDep = false; + bool isPreviouslySatisfiedImportantDep = false; + if(!ForceImportantDeps && !Start.IsCritical()) + { + bool found=false; + VerIterator instVer = Pkg.CurrentVer(); + if(!instVer.end()) + { + for (DepIterator D = instVer.DependsList(); D.end() != true; D++) + { + //FIXME: deal better with or-groups(?) + DepIterator LocalStart = D; + + if(IsImportantDep(D) && !D.IsCritical() && + Start.TargetPkg() == D.TargetPkg()) + { + if(!isPreviouslySatisfiedImportantDep) + { + DepIterator D2 = D; + while((D2->CompareOp & Dep::Or) != 0) + ++D2; + + isPreviouslySatisfiedImportantDep = + (((*this)[D2] & DepGNow) != 0); + } + + found=true; + } + } + // this is a new dep if it was not found to be already + // a important dep of the installed pacakge + isNewImportantDep = !found; + } + } + if(isNewImportantDep) + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "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 " + << Start.TargetPkg().Name() << std::endl; + + // skip important deps if the package is already installed + if (Pkg->CurrentVer != 0 && Start.IsCritical() == false + && !isNewImportantDep && !isPreviouslySatisfiedImportantDep + && !ForceImportantDeps) continue; /* If we are in an or group locate the first or that can @@ -680,7 +959,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* This bit is for processing the possibilty of an install/upgrade fixing the problem */ SPtrArray List = Start.AllTargets(); - if ((DepState[Start->ID] & DepCVer) == DepCVer) + if (Start->Type != Dep::DpkgBreaks && + (DepState[Start->ID] & DepCVer) == DepCVer) { // Right, find the best version to install.. Version **Cur = List; @@ -711,33 +991,47 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - if (InstPkg.end() == false) + if (InstPkg.end() == false) { if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) std::clog << "Installing " << InstPkg.Name() << " as dep of " << Pkg.Name() << std::endl; - MarkInstall(InstPkg,true,Depth + 1); - - // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) - PkgState[InstPkg->ID].Flags |= Flag::Auto; + // 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; + MarkInstall(InstPkg,true,Depth + 1, true); + } + else + { + // mark automatic dependency + MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps); + // Set the autoflag, after MarkInstall because MarkInstall unsets it + if (P->CurrentVer == 0) + PkgState[InstPkg->ID].Flags |= Flag::Auto; + } } - continue; } - + /* For conflicts we just de-install the package and mark as auto, - Conflicts may not have or groups */ - if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes) + Conflicts may not have or groups. For dpkg's Breaks we try to + upgrade the package. */ + if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes || + Start->Type == Dep::DpkgBreaks) { for (Version **I = List; *I != 0; I++) { VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - MarkDelete(Pkg); - PkgState[Pkg->ID].Flags |= Flag::Auto; + + if (Start->Type != Dep::DpkgBreaks) + MarkDelete(Pkg); + else + if (PkgState[Pkg->ID].CandidateVer != *I) + MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); } continue; } @@ -749,6 +1043,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + ActionGroup group(*this); + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -767,9 +1063,11 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) /* */ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) { + ActionGroup group(*this); + pkgCache::PkgIterator Pkg = TargetVer.ParentPkg(); StateCache &P = PkgState[Pkg->ID]; - + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -782,6 +1080,18 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) Update(Pkg); AddSizes(Pkg); } + +void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto) +{ + StateCache &state = PkgState[Pkg->ID]; + + ActionGroup group(*this); + + if(Auto) + state.Flags |= Flag::Auto; + else + state.Flags &= ~Flag::Auto; +} /*}}}*/ // StateCache::Update - Compute the various static display things /*{{{*/ // --------------------------------------------------------------------- @@ -864,11 +1174,290 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) return Last; } /*}}}*/ + // Policy::IsImportantDep - True if the dependency is important /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) { - return Dep.IsCritical(); + if(Dep.IsCritical()) + return true; + else if(Dep->Type == pkgCache::Dep::Recommends) + { + if ( _config->FindB("APT::Install-Recommends", false)) + return true; + // we suport a special mode to only install-recommends for certain + // sections + // FIXME: this is a meant as a temporarly solution until the + // recommends are cleaned up + const char *sec = Dep.ParentVer().Section(); + if (sec && ConfigValueInSubTree("APT::Install-Recommends-Sections", sec)) + return true; + } + else if(Dep->Type == pkgCache::Dep::Suggests) + return _config->FindB("APT::Install-Suggests", false); + + return false; } /*}}}*/ + +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() + : constructedSuccessfully(false) +{ + Configuration::Item const *Opts; + Opts = _config->Tree("APT::NeverAutoRemove"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + + regex_t *p = new regex_t; + if(regcomp(p,Opts->Value.c_str(), + REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) + { + regfree(p); + delete p; + _error->Error("Regex compilation error for APT::NeverAutoRemove"); + return; + } + + rootSetRegexp.push_back(p); + } + } + + constructedSuccessfully = true; +} + +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() +{ + for(unsigned int i = 0; i < rootSetRegexp.size(); i++) + { + regfree(rootSetRegexp[i]); + delete rootSetRegexp[i]; + } +} + + +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) + return true; + + return false; +} + +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() +{ + DefaultRootSetFunc *f = new DefaultRootSetFunc; + if(f->wasConstructedSuccessfully()) + return f; + else + { + delete f; + return NULL; + } +} + +bool pkgDepCache::MarkFollowsRecommends() +{ + return _config->FindB("APT::AutoRemove::RecommendsImportant", true); +} + +bool pkgDepCache::MarkFollowsSuggests() +{ + return _config->FindB("APT::AutoRemove::SuggestsImportant", false); +} + +// the main mark algorithm +bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) +{ + bool follow_recommends; + bool follow_suggests; + + // init the states + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + PkgState[p->ID].Marked = false; + PkgState[p->ID].Garbage = false; + + // debug output + if(_config->FindB("Debug::pkgAutoRemove",false) + && PkgState[p->ID].Flags & Flag::Auto) + std::clog << "AutoDep: " << p.Name() << std::endl; + } + + // init vars + follow_recommends = MarkFollowsRecommends(); + follow_suggests = MarkFollowsSuggests(); + + + + // do the mark part, this is the core bit of the algorithm + for(PkgIterator p = PkgBegin(); !p.end(); ++p) + { + if(!(PkgState[p->ID].Flags & Flag::Auto) || + (p->Flags & Flag::Essential) || + userFunc.InRootSet(p)) + + { + // the package is installed (and set to keep) + if(PkgState[p->ID].Keep() && !p.CurrentVer().end()) + MarkPackage(p, p.CurrentVer(), + follow_recommends, follow_suggests); + // the package is to be installed + else if(PkgState[p->ID].Install()) + MarkPackage(p, PkgState[p->ID].InstVerIter(*this), + follow_recommends, follow_suggests); + } + } + + return true; +} + +// mark a single package in Mark-and-Sweep +void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests) +{ + pkgDepCache::StateCache &state = PkgState[pkg->ID]; + VerIterator currver = pkg.CurrentVer(); + VerIterator candver = state.CandidateVerIter(*this); + VerIterator instver = state.InstVerIter(*this); + +#if 0 + // If a package was garbage-collected but is now being marked, we + // should re-select it + // For cases when a pkg is set to upgrade and this trigger the + // removal of a no-longer used dependency. if the pkg is set to + // keep again later it will result in broken deps + if(state.Delete() && state.RemoveReason = Unused) + { + if(ver==candver) + mark_install(pkg, false, false, NULL); + else if(ver==pkg.CurrentVer()) + MarkKeep(pkg, false, false); + + instver=state.InstVerIter(*this); + } +#endif + + // For packages that are not going to be removed, ignore versions + // other than the InstVer. For packages that are going to be + // removed, ignore versions other than the current version. + if(!(ver == instver && !instver.end()) && + !(ver == currver && instver.end() && !ver.end())) + return; + + // if we are marked already we are done + if(state.Marked) + return; + + if(_config->FindB("Debug::pkgAutoRemove",false)) + { + std::clog << "Marking: " << pkg.Name(); + if(!ver.end()) + std::clog << " " << ver.VerStr(); + if(!currver.end()) + std::clog << ", Curr=" << currver.VerStr(); + if(!instver.end()) + std::clog << ", Inst=" << instver.VerStr(); + std::clog << std::endl; + } + + state.Marked=true; + + if(!ver.end()) + { + for(DepIterator d = ver.DependsList(); !d.end(); ++d) + { + if(d->Type == Dep::Depends || + d->Type == Dep::PreDepends || + (follow_recommends && + d->Type == Dep::Recommends) || + (follow_suggests && + d->Type == Dep::Suggests)) + { + // Try all versions of this package. + for(VerIterator V = d.TargetPkg().VersionList(); + !V.end(); ++V) + { + if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer())) + { + if(_config->FindB("Debug::pkgAutoRemove",false)) + { + std::clog << "Following dep: " << d.ParentPkg().Name() + << " " << d.ParentVer().VerStr() << " " + << d.DepType() << " " + << d.TargetPkg().Name(); + if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) + { + std::clog << " (" << d.CompType() << " " + << d.TargetVer() << ")"; + } + std::clog << std::endl; + } + MarkPackage(V.ParentPkg(), V, + follow_recommends, follow_suggests); + } + } + // Now try virtual packages + for(PrvIterator prv=d.TargetPkg().ProvidesList(); + !prv.end(); ++prv) + { + if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, + d.TargetVer())) + { + if(_config->FindB("Debug::pkgAutoRemove",false)) + { + std::clog << "Following dep: " << d.ParentPkg().Name() + << " " << d.ParentVer().VerStr() << " " + << d.DepType() << " " + << d.TargetPkg().Name(); + if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) + { + std::clog << " (" << d.CompType() << " " + << d.TargetVer() << ")"; + } + std::clog << ", provided by " + << prv.OwnerPkg().Name() << " " + << prv.OwnerVer().VerStr() + << std::endl; + } + + MarkPackage(prv.OwnerPkg(), prv.OwnerVer(), + follow_recommends, follow_suggests); + } + } + } + } + } +} + +bool pkgDepCache::Sweep() +{ + // do the sweep + for(PkgIterator p=PkgBegin(); !p.end(); ++p) + { + StateCache &state=PkgState[p->ID]; + + // skip required packages + if (!p.CurrentVer().end() && + (p.CurrentVer()->Priority == pkgCache::State::Required)) + continue; + + // if it is not marked and it is installed, it's garbage + if(!state.Marked && (!p.CurrentVer().end() || state.Install())) + { + state.Garbage=true; + if(_config->FindB("Debug::pkgAutoRemove",false)) + std::cout << "Garbage: " << p.Name() << std::endl; + } + } + + return true; +} diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6d51920..f41ad17 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +// -*- mode: c++; mode: fold -*- // Description /*{{{*/ // $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $ /* ###################################################################### @@ -38,16 +38,76 @@ #ifndef PKGLIB_DEPCACHE_H #define PKGLIB_DEPCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/depcache.h" -#endif #include #include +#include + +#include +#include + class pkgDepCache : protected pkgCache::Namespace { public: + + /** \brief An arbitrary predicate on packages. */ + class InRootSetFunc + { + public: + virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;}; + virtual ~InRootSetFunc() {}; + }; + + private: + /** \brief Mark a single package and all its unmarked important + * dependencies during mark-and-sweep. + * + * Recursively invokes itself to mark all dependencies of the + * package. + * + * \param pkg The package to mark. + * + * \param ver The version of the package that is to be marked. + * + * \param follow_recommends If \b true, recommendations of the + * package will be recursively marked. + * + * \param follow_suggests If \b true, suggestions of the package + * will be recursively marked. + */ + void MarkPackage(const pkgCache::PkgIterator &pkg, + const pkgCache::VerIterator &ver, + bool follow_recommends, + bool follow_suggests); + + /** \brief Update the Marked field of all packages. + * + * Each package's StateCache::Marked field will be set to \b true + * if and only if it can be reached from the root set. By + * default, the root set consists of the set of manually installed + * or essential packages, but it can be extended using the + * parameter #rootFunc. + * + * \param rootFunc A callback that can be used to add extra + * packages to the root set. + * + * \return \b false if an error occurred. + */ + bool MarkRequired(InRootSetFunc &rootFunc); + + /** \brief Set the StateCache::Garbage flag on all packages that + * should be removed. + * + * Packages that were not marked by the last call to #MarkRequired + * are tested to see whether they are actually garbage. If so, + * they are marked as such. + * + * \return \b false if an error occurred. + */ + bool Sweep(); + + public: // These flags are used in DepState enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2), @@ -63,6 +123,84 @@ class pkgDepCache : protected pkgCache::Namespace enum VersionTypes {NowVersion, InstallVersion, CandidateVersion}; enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2}; + + /** \brief Represents an active action group. + * + * An action group is a group of actions that are currently being + * performed. While an active group is active, certain routine + * clean-up actions that would normally be performed after every + * cache operation are delayed until the action group is + * completed. This is necessary primarily to avoid inefficiencies + * when modifying a large number of packages at once. + * + * This class represents an active action group. Creating an + * instance will create an action group; destroying one will + * destroy the corresponding action group. + * + * The following operations are suppressed by this class: + * + * - Keeping the Marked and Garbage flags up to date. + * + * \note This can be used in the future to easily accumulate + * atomic actions for undo or to display "what apt did anyway"; + * e.g., change the counter of how many action groups are active + * to a std::set of pointers to them and use those to store + * information about what happened in a group in the group. + */ + class ActionGroup + { + pkgDepCache &cache; + + bool released; + + /** Action groups are noncopyable. */ + ActionGroup(const ActionGroup &other); + public: + /** \brief Create a new ActionGroup. + * + * \param cache The cache that this ActionGroup should + * manipulate. + * + * As long as this object exists, no automatic cleanup + * operations will be undertaken. + */ + ActionGroup(pkgDepCache &cache); + + /** \brief Clean up the action group before it is destroyed. + * + * If it is destroyed later, no second cleanup wil be run. + */ + void release(); + + /** \brief Destroy the action group. + * + * If this is the last action group, the automatic cache + * cleanup operations will be undertaken. + */ + ~ActionGroup(); + }; + + /** \brief Returns \b true for packages matching a regular + * expression in APT::NeverAutoRemove. + */ + class DefaultRootSetFunc : public InRootSetFunc + { + std::vector rootSetRegexp; + bool constructedSuccessfully; + + public: + DefaultRootSetFunc(); + ~DefaultRootSetFunc(); + + /** \return \b true if the class initialized successfully, \b + * false otherwise. Used to avoid throwing an exception, since + * APT classes generally don't. + */ + bool wasConstructedSuccessfully() const { return constructedSuccessfully; } + + bool InRootSet(const pkgCache::PkgIterator &pkg); + }; + struct StateCache { // Epoch stripped text versions of the two version fields @@ -79,6 +217,17 @@ class pkgDepCache : protected pkgCache::Namespace unsigned short Flags; unsigned short iFlags; // Internal flags + /** \brief \b true if this package can be reached from the root set. */ + bool Marked; + + /** \brief \b true if this package is unused and should be removed. + * + * This differs from !#Marked, because it is possible that some + * unreachable packages will be protected from becoming + * garbage. + */ + bool Garbage; + // Various tree indicators signed char Status; // -1,0,1,2 unsigned char Mode; // ModeList @@ -97,7 +246,9 @@ class pkgDepCache : protected pkgCache::Namespace inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;}; inline bool Held() const {return Status != 0 && Keep();}; inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;}; + inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;}; inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; + inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;}; inline bool Install() const {return Mode == ModeInstall;}; inline VerIterator InstVerIter(pkgCache &Cache) {return VerIterator(Cache,InstallVer);}; @@ -119,6 +270,14 @@ class pkgDepCache : protected pkgCache::Namespace virtual ~Policy() {}; }; + + private: + /** The number of open "action groups"; certain post-action + * operations are suppressed if this number is > 0. + */ + int group_level; + + friend class ActionGroup; protected: @@ -133,6 +292,7 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long iDelCount; unsigned long iKeepCount; unsigned long iBrokenCount; + unsigned long iPolicyBrokenCount; unsigned long iBadCount; Policy *delLocalPolicy; // For memory clean up.. @@ -182,16 +342,69 @@ class pkgDepCache : protected pkgCache::Namespace inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];}; inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];}; - // Manipulators - void MarkKeep(PkgIterator const &Pkg,bool Soft = false); + /** \return A function identifying packages in the root set other + * than manually installed packages and essential packages, or \b + * NULL if an error occurs. + * + * \todo Is this the best place for this function? Perhaps the + * settings for mark-and-sweep should be stored in a single + * external class? + */ + virtual InRootSetFunc *GetRootSetFunc(); + + /** \return \b true if the garbage collector should follow recommendations. + */ + virtual bool MarkFollowsRecommends(); + + /** \return \b true if the garbage collector should follow suggestions. + */ + virtual bool MarkFollowsSuggests(); + + /** \brief Update the Marked and Garbage fields of all packages. + * + * This routine is implicitly invoked after all state manipulators + * and when an ActionGroup is destroyed. It invokes #MarkRequired + * and #Sweep to do its dirty work. + * + * \param rootFunc A predicate that returns \b true for packages + * that should be added to the root set. + */ + bool MarkAndSweep(InRootSetFunc &rootFunc) + { + return MarkRequired(rootFunc) && Sweep(); + } + + bool MarkAndSweep() + { + std::auto_ptr f(GetRootSetFunc()); + if(f.get() != NULL) + return MarkAndSweep(*f.get()); + else + return false; + } + + /** \name State Manipulators + */ + // @{ + void MarkKeep(PkgIterator const &Pkg, bool Soft = false, + bool FromUser = true); void MarkDelete(PkgIterator const &Pkg,bool Purge = false); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, - unsigned long Depth = 0); + unsigned long Depth = 0, bool FromUser = true, + bool ForceImportantDeps = false); void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); + + /** Set the "is automatically installed" flag of Pkg. */ + void MarkAuto(const PkgIterator &Pkg, bool Auto); + // @} // This is for debuging void Update(OpProgress *Prog = 0); + + // read persistent states + bool readStateFile(OpProgress *prog); + bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); // Size queries inline double UsrSize() {return iUsrSize;}; @@ -200,6 +413,7 @@ class pkgDepCache : protected pkgCache::Namespace inline unsigned long KeepCount() {return iKeepCount;}; inline unsigned long InstCount() {return iInstCount;}; inline unsigned long BrokenCount() {return iBrokenCount;}; + inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;}; inline unsigned long BadCount() {return iBadCount;}; bool Init(OpProgress *Prog); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 1f65062..9e5c03e 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -32,6 +32,8 @@ using namespace std; + + // IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -512,10 +514,10 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File) fputc('\n',Target); return true; } - - /*}}}*/ - +// SigVerify::Verify - Verify a files md5sum against its metaindex /*{{{*/ +// --------------------------------------------------------------------- +/* */ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) { const indexRecords::checkSum *Record = MetaIndex->Lookup(file); @@ -526,23 +528,16 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) return false; } - MD5Summation sum; - FileFd Fd(prefix+file, FileFd::ReadOnly); - sum.AddFD(Fd.Fd(), Fd.Size()); - Fd.Close(); - string MD5 = (string)sum.Result(); - - if (Record->MD5Hash != MD5) + if (!Record->Hash.VerifyFile(prefix+file)) { - _error->Warning("MD5 mismatch for: %s",file.c_str()); + _error->Warning("Hash mismatch for: %s",file.c_str()); return false; } if(_config->FindB("Debug::aptcdrom",false)) { cout << "File: " << prefix+file << endl; - cout << "Expected MD5sum: " << Record->MD5Hash << endl; - cout << "got: " << MD5 << endl << endl; + cout << "Expected Hash " << Record->Hash.toStr() << endl; } return true; @@ -644,7 +639,7 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, // Open the Release file and add it to the MetaIndex if(!MetaIndex->Load(*I+"Release")) { - _error->Error(MetaIndex->ErrorText.c_str()); + _error->Error("%s",MetaIndex->ErrorText.c_str()); return false; } @@ -670,3 +665,178 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } + + +bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector &List, + pkgCdromStatus *log) +{ + OpProgress *Progress = NULL; + if (List.size() == 0) + return true; + + if(log) + Progress = log->GetOpProgress(); + + bool Debug = _config->FindB("Debug::aptcdrom",false); + + // Prepare the progress indicator + unsigned long TotalSize = 0; + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + struct stat Buf; + if (stat(string(*I).c_str(),&Buf) != 0 && + stat(string(*I + ".gz").c_str(),&Buf) != 0) + return _error->Errno("stat","Stat failed for %s", + string(*I).c_str()); + TotalSize += Buf.st_size; + } + + unsigned long CurrentSize = 0; + unsigned int NotFound = 0; + unsigned int WrongSize = 0; + unsigned int Packages = 0; + for (vector::iterator I = List.begin(); I != List.end(); I++) + { + string OrigPath = string(*I,CDROM.length()); + unsigned long FileSize = 0; + + // Open the package file + FileFd Pkg; + if (FileExists(*I) == true) + { + Pkg.Open(*I,FileFd::ReadOnly); + FileSize = Pkg.Size(); + } + else + { + FileFd From(*I + ".gz",FileFd::ReadOnly); + if (_error->PendingError() == true) + return false; + FileSize = From.Size(); + + // Get a temp file + FILE *tmp = tmpfile(); + if (tmp == 0) + return _error->Errno("tmpfile","Unable to create a tmp file"); + Pkg.Fd(dup(fileno(tmp))); + fclose(tmp); + + // Fork gzip + pid_t Process = fork(); + if (Process < 0) + return _error->Errno("fork","Couldn't fork gzip"); + + // The child + if (Process == 0) + { + dup2(From.Fd(),STDIN_FILENO); + dup2(Pkg.Fd(),STDOUT_FILENO); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[3]; + string Tmp = _config->Find("Dir::bin::gzip","gzip"); + Args[0] = Tmp.c_str(); + Args[1] = "-d"; + Args[2] = 0; + execvp(Args[0],(char **)Args); + exit(100); + } + + // Wait for gzip to finish + if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false) + return _error->Error("gzip failed, perhaps the disk is full."); + + Pkg.Seek(0); + } + pkgTagFile Parser(&Pkg); + if (_error->PendingError() == true) + return false; + + // Open the output file + char S[400]; + snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(), + (*I).c_str() + CDROM.length()); + string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; + TargetF += URItoFileName(S); + if (_config->FindB("APT::CDROM::NoAct",false) == true) + TargetF = "/dev/null"; + FileFd Target(TargetF,FileFd::WriteEmpty); + FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); + if (_error->PendingError() == true) + return false; + if (TargetFl == 0) + return _error->Errno("fdopen","Failed to reopen fd"); + + // Setup the progress meter + if(Progress) + Progress->OverallProgress(CurrentSize,TotalSize,FileSize, + string("Reading Translation Indexes")); + + // Parse + if(Progress) + Progress->SubProgress(Pkg.Size()); + pkgTagSection Section; + this->Section = &Section; + string Prefix; + unsigned long Hits = 0; + unsigned long Chop = 0; + while (Parser.Step(Section) == true) + { + if(Progress) + Progress->Progress(Parser.Offset()); + + const char *Start; + const char *Stop; + Section.GetSection(Start,Stop); + fwrite(Start,Stop-Start, 1, TargetFl); + fputc('\n',TargetFl); + + Packages++; + Hits++; + } + fclose(TargetFl); + + if (Debug == true) + cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl; + + if (_config->FindB("APT::CDROM::NoAct",false) == false) + { + // Move out of the partial directory + Target.Close(); + string FinalF = _config->FindDir("Dir::State::lists"); + FinalF += URItoFileName(S); + if (rename(TargetF.c_str(),FinalF.c_str()) != 0) + return _error->Errno("rename","Failed to rename"); + } + + + CurrentSize += FileSize; + } + if(Progress) + Progress->Done(); + + // Some stats + if(log) { + stringstream msg; + if(NotFound == 0 && WrongSize == 0) + ioprintf(msg, _("Wrote %i records.\n"), Packages); + else if (NotFound != 0 && WrongSize == 0) + ioprintf(msg, _("Wrote %i records with %i missing files.\n"), + Packages, NotFound); + else if (NotFound == 0 && WrongSize != 0) + ioprintf(msg, _("Wrote %i records with %i mismatched files\n"), + Packages, WrongSize); + if (NotFound != 0 && WrongSize != 0) + ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize); + } + + if (Packages == 0) + _error->Warning("No valid records were found."); + + if (NotFound + WrongSize > 10) + _error->Warning("Alot of entries were discarded, something may be wrong.\n"); + + + return true; +} diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 4dcb2b4..7778ae5 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -70,6 +70,17 @@ class SourceCopy : public IndexCopy public: }; +class TranslationsCopy +{ + protected: + pkgTagSection *Section; + + public: + bool CopyTranslations(string CDROM,string Name,vector &List, + pkgCdromStatus *log); +}; + + class SigVerify { bool Verify(string prefix,string file, indexRecords *records); @@ -81,4 +92,6 @@ class SigVerify vector PkgList,vector SrcList); }; + + #endif diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 4966516..b385961 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -8,12 +8,12 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/indexfile.h" -#endif - +#include #include #include + +#include +#include /*}}}*/ // Global list of Item supported @@ -67,3 +67,63 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, return string(); } /*}}}*/ +// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgIndexFile::TranslationsAvailable() +{ + const string Translation = _config->Find("APT::Acquire::Translation"); + + if (Translation.compare("none") != 0) + return CheckLanguageCode(LanguageCode().c_str()); + else + return false; +} + /*}}}*/ +// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ +// --------------------------------------------------------------------- +/* */ +/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro, + de_DE.ISO8859-1, tig_ER + more in /etc/gdm/locale.conf +*/ + +bool pkgIndexFile::CheckLanguageCode(const char *Lang) +{ + if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) + return true; + + if (strcmp(Lang,"C") != 0) + _error->Warning("Wrong language code %s", Lang); + + return false; +} + /*}}}*/ +// IndexFile::LanguageCode - Return the Language Code /*{{{*/ +// --------------------------------------------------------------------- +/* return the language code */ +string pkgIndexFile::LanguageCode() +{ + const string Translation = _config->Find("APT::Acquire::Translation"); + + if (Translation.compare("environment") == 0) + { + string lang = std::setlocale(LC_MESSAGES,NULL); + + // we have a mapping of the language codes that contains all the language + // codes that need the country code as well + // (like pt_BR, pt_PT, sv_SE, zh_*, en_*) + const char *need_full_langcode[] = { "pt","sv","zh","en", NULL }; + for(const char **s = need_full_langcode;*s != NULL; s++) + if(lang.find(*s) == 0) + return lang.substr(0,5); + + if(lang.size() > 2) + return lang.substr(0,2); + else + return lang; + } + else + return Translation; +} + /*}}}*/ diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 61049f4..3cc5016 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -5,10 +5,11 @@ Index File - Abstraction for an index of archive/source file. - There are 3 primary sorts of index files, all represented by this + There are 4 primary sorts of index files, all represented by this class: Binary index files + Binary translation files Bianry index files decribing the local system Source index files @@ -21,9 +22,6 @@ #ifndef PKGLIB_INDEXFILE_H #define PKGLIB_INDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/indexfile.h" -#endif #include #include @@ -80,6 +78,10 @@ class pkgIndexFile virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; + static bool TranslationsAvailable(); + static bool CheckLanguageCode(const char *Lang); + static string LanguageCode(); + bool IsTrusted() const { return Trusted; }; pkgIndexFile(bool Trusted): Trusted(Trusted) {}; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 06ed792..502f454 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -3,9 +3,6 @@ // $Id: indexrecords.cc,v 1.1.2.4 2003/12/30 02:11:43 mdz Exp $ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/indexrecords.h" -#endif #include #include #include @@ -53,32 +50,38 @@ bool indexRecords::Load(const string Filename) const char *Start, *End; Section.Get (Start, End, 0); + Suite = Section.FindS("Suite"); Dist = Section.FindS("Codename"); -// if (Dist.empty()) -// { -// ErrorText = _(("No Codename entry in Release file " + Filename).c_str()); -// return false; -// } - if (!Section.Find("MD5Sum", Start, End)) + + int i; + for (i=0;HashString::SupportedHashes()[i] != NULL; i++) { - ErrorText = _(("No MD5Sum entry in Release file " + Filename).c_str()); - return false; + if (!Section.Find(HashString::SupportedHashes()[i], Start, End)) + continue; + + string Name; + string Hash; + size_t Size; + while (Start < End) + { + if (!parseSumData(Start, End, Name, Hash, Size)) + return false; + indexRecords::checkSum *Sum = new indexRecords::checkSum; + Sum->MetaKeyFilename = Name; + Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash); + Sum->Size = Size; + Entries[Name] = Sum; + } + break; } - string Name; - string MD5Hash; - size_t Size; - while (Start < End) + + if(HashString::SupportedHashes()[i] == NULL) { - if (!parseSumData(Start, End, Name, MD5Hash, Size)) - return false; - indexRecords::checkSum *Sum = new indexRecords::checkSum; - Sum->MetaKeyFilename = Name; - Sum->MD5Hash = MD5Hash; - Sum->Size = Size; - Entries[Name] = Sum; - } - + ErrorText = _(("No Hash entry in Release file " + Filename).c_str()); + return false; + } + string Strdate = Section.FindS("Date"); // FIXME: verify this somehow? return true; } diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 414face..468d2bd 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -5,11 +5,10 @@ #ifndef PKGLIB_INDEXRECORDS_H #define PKGLIB_INDEXRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/indexrecords.h" -#endif + #include #include +#include #include #include @@ -47,7 +46,7 @@ class indexRecords struct indexRecords::checkSum { string MetaKeyFilename; - string MD5Hash; + HashString Hash; size_t Size; }; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index dc7b9b6..338bef6 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -14,6 +14,7 @@ #include #include +#include #include /*}}}*/ @@ -23,8 +24,6 @@ const char *pkgVersion = VERSION; const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "." Stringfy(APT_PKG_MINOR) "." Stringfy(APT_PKG_RELEASE); -const char *pkgCPU = COMMON_CPU; -const char *pkgOS = COMMON_OS; // pkgInitConfig - Initialize the configuration class /*{{{*/ // --------------------------------------------------------------------- @@ -34,12 +33,10 @@ const char *pkgOS = COMMON_OS; bool pkgInitConfig(Configuration &Cnf) { // General APT things - if (strcmp(COMMON_OS,"linux") == 0 || - strcmp(COMMON_OS,"unknown") == 0) - Cnf.Set("APT::Architecture",COMMON_CPU); - else - Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU); + Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); + Cnf.Set("APT::Install-Recommends", true); + Cnf.Set("APT::Install-Suggests", false); Cnf.Set("Dir","/"); // State @@ -71,7 +68,14 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); - + + // State + Cnf.Set("Dir::Log","var/log/apt"); + Cnf.Set("Dir::Log::Terminal","term.log"); + + // Translation + Cnf.Set("APT::Acquire::Translation", "environment"); + bool Res = true; // Read an alternate config file @@ -95,6 +99,14 @@ bool pkgInitConfig(Configuration &Cnf) if (Cnf.FindB("Debug::pkgInitConfig",false) == true) Cnf.Dump(); +#ifdef APT_DOMAIN + if (Cnf.Exists("Dir::Locale")) + { + bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str()); + bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str()); + } +#endif + return true; } /*}}}*/ diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 8255b40..6d8693b 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -17,14 +17,12 @@ #include // See the makefile -#define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 11 +#define APT_PKG_MAJOR 4 +#define APT_PKG_MINOR 6 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; extern const char *pkgLibVersion; -extern const char *pkgOS; -extern const char *pkgCPU; bool pkgInitConfig(Configuration &Cnf); bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1ad7244..a068b01 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,9 +14,9 @@ include ../buildlib/defaults.mak LIBRARY=apt-pkg LIBEXT= #$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.11 +MAJOR=4.6 MINOR=0 -SLIBS=$(PTHREADLIB) $(INTLLIBS) +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil $(LIBICONV) APT_DOMAIN:=libapt-pkg$(MAJOR) # Source code for the contributed non-core things diff --git a/apt-pkg/makefile.orig b/apt-pkg/makefile.orig new file mode 100644 index 0000000..dce03b1 --- /dev/null +++ b/apt-pkg/makefile.orig @@ -0,0 +1,59 @@ +# -*- make -*- +BASE=.. +SUBDIR=apt-pkg + +# Header location +SUBDIRS = deb contrib +HEADER_TARGETDIRS = apt-pkg + +# Bring in the default rules +include ../buildlib/defaults.mak + +# The library name, don't forget to update init.h and the copy in +# methods/makefile - FIXME +LIBRARY=apt-pkg +LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) +MAJOR=4.6 +MINOR=0 +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil $(LIBICONV) +APT_DOMAIN:=libapt-pkg$(MAJOR) + +# Source code for the contributed non-core things +SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ + contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \ + contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \ + contrib/cdromutl.cc contrib/crc-16.cc \ + contrib/fileutl.cc +HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \ + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h + +# Source code for the core main library +SOURCE+= pkgcache.cc version.cc depcache.cc \ + orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \ + pkgrecords.cc algorithms.cc acquire.cc\ + acquire-worker.cc acquire-method.cc init.cc clean.cc \ + srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ + pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ + indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc +HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ + orderlist.h sourcelist.h packagemanager.h tagfile.h \ + init.h pkgcache.h version.h progress.h pkgrecords.h \ + acquire.h acquire-worker.h acquire-item.h acquire-method.h \ + clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ + pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ + vendorlist.h cdrom.h indexcopy.h + +# Source code for the debian specific components +# In theory the deb headers do not need to be exported.. +SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \ + deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \ + deb/debindexfile.cc deb/debindexfile.cc deb/debmetaindex.cc +HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \ + deblistparser.h debsystem.h debindexfile.h debmetaindex.h + +HEADERS := $(addprefix apt-pkg/,$(HEADERS)) + +# Private header files +HEADERS+= system.h + +include $(LIBRARY_H) diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 8ebf235..2b87d7d 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -1,9 +1,6 @@ #ifndef PKGLIB_METAINDEX_H #define PKGLIB_METAINDEX_H -/* #ifdef __GNUG__ */ -/* #pragma interface "apt-pkg/metaindex.h" */ -/* #endif */ #include #include diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 8d3a979..ca18f1d 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -39,7 +39,7 @@ ordering. Each of the features can be enabled in the sorting routine at an - arbitary priority to give quite abit of control over the final unpacking + arbitrary priority to give quite abit of control over the final unpacking order. The rules listed above may never be violated and are called Critical. @@ -63,9 +63,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/orderlist.h" -#endif #include #include #include @@ -491,11 +488,13 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical) continue; if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && Cache[Pkg].InstallVer != *I) continue; if ((D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes) && (Version *)Pkg.CurrentVer() != *I) continue; @@ -630,6 +629,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) /* Forward critical dependencies MUST be correct before the package can be unpacked. */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && D->Type != pkgCache::Dep::PreDepends) continue; @@ -668,7 +668,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) } return true; } - /*}}}*/ + // OrderList::DepUnPackPreD - Critical UnPacking ordering with depends /*{{{*/ // --------------------------------------------------------------------- /* Critical PreDepends (also configure immediate and essential) strives to @@ -803,9 +803,20 @@ bool pkgOrderList::DepUnPackDep(DepIterator D) return false; } else + { if (D->Type == pkgCache::Dep::Depends) if (VisitProvides(D,false) == false) return false; + + if (D->Type == pkgCache::Dep::DpkgBreaks) + { + if (CheckDep(D) == true) + continue; + + if (VisitNode(D.TargetPkg()) == false) + return false; + } + } } return true; } @@ -953,6 +964,7 @@ bool pkgOrderList::CheckDep(DepIterator D) /* Conflicts requires that all versions are not present, depends just needs one */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes) { /* Try to find something that does not have the after flag set diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h index d13301b..bbceb38 100644 --- a/apt-pkg/orderlist.h +++ b/apt-pkg/orderlist.h @@ -16,9 +16,6 @@ #ifndef PKGLIB_ORDERLIST_H #define PKGLIB_ORDERLIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/orderlist.h" -#endif #include diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 4b3dd8b..304d1c6 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -13,10 +13,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/packagemanager.h" -#endif - #include #include #include @@ -29,7 +25,7 @@ #include #include - /*}}}*/ +#include using namespace std; @@ -95,9 +91,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, be downloaded. */ bool pkgPackageManager::FixMissing() { + pkgDepCache::ActionGroup group(Cache); pkgProblemResolver Resolve(&Cache); List->SetFileList(FileNames); - + bool Bad = false; for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { @@ -106,7 +103,7 @@ bool pkgPackageManager::FixMissing() // Okay, this file is missing and we need it. Mark it for keep Bad = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } // We have to empty the list otherwise it will not have the new changes @@ -121,6 +118,41 @@ bool pkgPackageManager::FixMissing() } /*}}}*/ +// PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/ +// --------------------------------------------------------------------- +/* This adds the immediate flag to the pkg and recursively to the + dependendies + */ +void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) +{ + DepIterator D; + + if(UseInstallVer) + { + if(Cache[I].InstallVer == 0) + return; + D = Cache[I].InstVerIter(Cache).DependsList(); + } else { + if (I->CurrentVer == 0) + return; + D = I.CurrentVer().DependsList(); + } + + for ( /* nothing */ ; D.end() == false; D++) + if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) + { + if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate)) + { + if(Debug) + clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl; + List->Flag(D.TargetPkg(),pkgOrderList::Immediate); + ImmediateAdd(D.TargetPkg(), UseInstallVer); + } + } + return; +} + /*}}}*/ + // PM::CreateOrderList - Create the ordering class /*{{{*/ // --------------------------------------------------------------------- /* This populates the ordering list with all the packages that are @@ -147,21 +179,15 @@ bool pkgPackageManager::CreateOrderList() (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) && NoImmConfigure == false) { + if(Debug) + clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl; List->Flag(I,pkgOrderList::Immediate); - - // Look for other packages to make immediate configurea - if (Cache[I].InstallVer != 0) - for (DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); - D.end() == false; D++) - if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) - List->Flag(D.TargetPkg(),pkgOrderList::Immediate); + + // Look for other install packages to make immediate configurea + ImmediateAdd(I, true); // And again with the current version. - if (I->CurrentVer != 0) - for (DepIterator D = I.CurrentVer().DependsList(); - D.end() == false; D++) - if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) - List->Flag(D.TargetPkg(),pkgOrderList::Immediate); + ImmediateAdd(I, false); } // Not interesting @@ -627,18 +653,31 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Completed; } /*}}}*/ +// PM::DoInstallPostFork - Does install part that happens after the fork /*{{{*/ +// --------------------------------------------------------------------- +pkgPackageManager::OrderResult +pkgPackageManager::DoInstallPostFork(int statusFd) +{ + if(statusFd > 0) + // FIXME: use SetCloseExec here once it taught about throwing + // exceptions instead of doing _exit(100) on failure + fcntl(statusFd,F_SETFD,FD_CLOEXEC); + bool goResult = Go(statusFd); + if(goResult == false) + return Failed; + + return Res; +}; + // PM::DoInstall - Does the installation /*{{{*/ // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { - OrderResult Res = OrderInstall(); - if(Debug) - std::clog << "OrderInstall() returned: " << Res << std::endl; - if (Res != Failed) - if (Go(status_fd) == false) - return Failed; - return Res; + if(DoInstallPreFork() == Failed) + return Failed; + + return DoInstallPostFork(statusFd); } /*}}}*/ diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index f64637d..a1bfdc5 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -23,12 +23,11 @@ #ifndef PKGLIB_PACKAGEMANAGER_H #define PKGLIB_PACKAGEMANAGER_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/packagemanager.h" -#endif #include +#include #include +#include using std::string; @@ -50,6 +49,7 @@ class pkgPackageManager : protected pkgCache::Namespace bool Debug; bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0); + void ImmediateAdd(PkgIterator P, bool UseInstallVer); virtual OrderResult OrderInstall(); bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver); bool CreateOrderList(); @@ -70,13 +70,28 @@ class pkgPackageManager : protected pkgCache::Namespace virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;}; virtual bool Go(int statusFd=-1) {return true;}; virtual void Reset() {}; - + + // the result of the operation + OrderResult Res; + public: // Main action members bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs); - OrderResult DoInstall(int statusFd=-1); + + // Do the installation + OrderResult DoInstall(int statusFd=-1); + + // stuff that needs to be done before the fork() of a library that + // uses apt + OrderResult DoInstallPreFork() { + Res = OrderInstall(); + return Res; + }; + + // stuff that needs to be done after the fork + OrderResult DoInstallPostFork(int statusFd=-1); bool FixMissing(); pkgPackageManager(pkgDepCache *Cache); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 9926bef..8eb6208 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -20,12 +20,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgcache.h" -#pragma implementation "apt-pkg/cacheiterators.h" -#endif - #include +#include #include #include #include @@ -43,6 +39,7 @@ using std::string; + // Cache::Header::Header - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Simply initialize the header */ @@ -52,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 = 4; + MajorVersion = 7; MinorVersion = 0; Dirty = false; @@ -60,17 +57,22 @@ pkgCache::Header::Header() PackageSz = sizeof(pkgCache::Package); PackageFileSz = sizeof(pkgCache::PackageFile); VersionSz = sizeof(pkgCache::Version); + DescriptionSz = sizeof(pkgCache::Description); DependencySz = sizeof(pkgCache::Dependency); ProvidesSz = sizeof(pkgCache::Provides); VerFileSz = sizeof(pkgCache::VerFile); + DescFileSz = sizeof(pkgCache::DescFile); PackageCount = 0; VersionCount = 0; + DescriptionCount = 0; DependsCount = 0; PackageFileCount = 0; VerFileCount = 0; + DescFileCount = 0; ProvidesCount = 0; MaxVerFileSize = 0; + MaxDescFileSize = 0; FileList = 0; StringList = 0; @@ -89,8 +91,10 @@ bool pkgCache::Header::CheckSizes(Header &Against) const PackageSz == Against.PackageSz && PackageFileSz == Against.PackageFileSz && VersionSz == Against.VersionSz && + DescriptionSz == Against.DescriptionSz && DependencySz == Against.DependencySz && VerFileSz == Against.VerFileSz && + DescFileSz == Against.DescFileSz && ProvidesSz == Against.ProvidesSz) return true; return false; @@ -115,8 +119,10 @@ bool pkgCache::ReMap() HeaderP = (Header *)Map.Data(); PkgP = (Package *)Map.Data(); VerFileP = (VerFile *)Map.Data(); + DescFileP = (DescFile *)Map.Data(); PkgFileP = (PackageFile *)Map.Data(); VerP = (Version *)Map.Data(); + DescP = (Description *)Map.Data(); ProvideP = (Provides *)Map.Data(); DepP = (Dependency *)Map.Data(); StringItemP = (StringItem *)Map.Data(); @@ -217,8 +223,8 @@ const char *pkgCache::DepType(unsigned char Type) { const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"), _("Recommends"),_("Conflicts"),_("Replaces"), - _("Obsoletes")}; - if (Type < 8) + _("Obsoletes"),_("Breaks")}; + if (Type < sizeof(Types)/sizeof(*Types)) return Types[Type]; return ""; } @@ -235,11 +241,11 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ - // Bases for iterator classes /*{{{*/ void pkgCache::VerIterator::_dummy() {} void pkgCache::DepIterator::_dummy() {} void pkgCache::PrvIterator::_dummy() {} +void pkgCache::DescIterator::_dummy() {} /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- @@ -268,7 +274,9 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsUnpack; if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured) + Pkg->CurrentState == pkgCache::State::HalfConfigured || + Pkg->CurrentState == pkgCache::State::TriggersPending || + Pkg->CurrentState == pkgCache::State::TriggersAwaited) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || @@ -281,10 +289,11 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and - conflicts. */ + conflicts (including dpkg's Breaks fields). */ bool pkgCache::DepIterator::IsCritical() { if (Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes || Dep->Type == pkgCache::Dep::Depends || Dep->Type == pkgCache::Dep::PreDepends) @@ -370,6 +379,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.ParentPkg()) continue; @@ -386,6 +396,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.OwnerPkg()) continue; @@ -599,3 +610,21 @@ string pkgCache::PkgFileIterator::RelStr() return Res; } /*}}}*/ +// VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/ +// --------------------------------------------------------------------- +/* return a DescIter for the current locale or the default if none is + * found + */ +pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const +{ + pkgCache::DescIterator DescDefault = DescriptionList(); + pkgCache::DescIterator Desc = DescDefault; + for (; Desc.end() == false; Desc++) + if (pkgIndexFile::LanguageCode() == Desc.LanguageCode()) + break; + if (Desc.end() == true) + Desc = DescDefault; + return Desc; +}; + + /*}}}*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 587d975..59d5003 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcache.h" -#endif #include #include @@ -38,32 +35,42 @@ class pkgCache struct Package; struct PackageFile; struct Version; + struct Description; struct Provides; struct Dependency; struct StringItem; struct VerFile; + struct DescFile; // Iterators class PkgIterator; class VerIterator; + class DescIterator; class DepIterator; class PrvIterator; class PkgFileIterator; class VerFileIterator; + class DescFileIterator; friend class PkgIterator; friend class VerIterator; + friend class DescInterator; friend class DepIterator; friend class PrvIterator; friend class PkgFileIterator; friend class VerFileIterator; + friend class DescFileIterator; class Namespace; // These are all the constants used in the cache structures + + // WARNING - if you change these lists you must also edit + // the stringification in pkgcache.cc and also consider whether + // the cache file will become incompatible. struct Dep { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, - Conflicts=5,Replaces=6,Obsoletes=7}; + Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8}; enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; @@ -74,7 +81,8 @@ class pkgCache enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4}; enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2, - HalfInstalled=4,ConfigFiles=5,Installed=6}; + HalfInstalled=4,ConfigFiles=5,Installed=6, + TriggersAwaited=7,TriggersPending=8}; }; struct Flag @@ -98,8 +106,10 @@ class pkgCache Header *HeaderP; Package *PkgP; VerFile *VerFileP; + DescFile *DescFileP; PackageFile *PkgFileP; Version *VerP; + Description *DescP; Provides *ProvideP; Dependency *DepP; StringItem *StringItemP; @@ -151,16 +161,20 @@ struct pkgCache::Header unsigned short PackageSz; unsigned short PackageFileSz; unsigned short VersionSz; + unsigned short DescriptionSz; unsigned short DependencySz; unsigned short ProvidesSz; unsigned short VerFileSz; + unsigned short DescFileSz; // Structure counts unsigned long PackageCount; unsigned long VersionCount; + unsigned long DescriptionCount; unsigned long DependsCount; unsigned long PackageFileCount; unsigned long VerFileCount; + unsigned long DescFileCount; unsigned long ProvidesCount; // Offsets @@ -169,10 +183,11 @@ struct pkgCache::Header map_ptrloc VerSysName; // StringTable map_ptrloc Architecture; // StringTable unsigned long MaxVerFileSize; + unsigned long MaxDescFileSize; /* Allocation pools, there should be one of these for each structure excluding the header */ - DynamicMMap::Pool Pools[7]; + DynamicMMap::Pool Pools[8]; // Rapid package name lookup map_ptrloc HashTable[2*1048]; @@ -193,7 +208,7 @@ struct pkgCache::Package map_ptrloc NextPackage; // Package map_ptrloc RevDepends; // Dependency map_ptrloc ProvidesList; // Provides - + // Install/Remove/Purge etc unsigned char SelectedState; // What unsigned char InstState; // Flags @@ -232,6 +247,14 @@ struct pkgCache::VerFile unsigned short Size; }; +struct pkgCache::DescFile +{ + map_ptrloc File; // PackageFile + map_ptrloc NextFile; // PkgVerFile + map_ptrloc Offset; // File offset + unsigned short Size; +}; + struct pkgCache::Version { map_ptrloc VerStr; // Stringtable @@ -241,6 +264,7 @@ struct pkgCache::Version // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version + map_ptrloc DescriptionList; // Description map_ptrloc DependsList; // Dependency map_ptrloc ParentPkg; // Package map_ptrloc ProvidesList; // Provides @@ -252,6 +276,22 @@ struct pkgCache::Version unsigned char Priority; }; +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 + // file else the Translation-CODE are used. + map_ptrloc language_code; // StringTable + map_ptrloc md5sum; // StringTable + + // Linked list + map_ptrloc FileList; // DescFile + map_ptrloc NextDesc; // Description + map_ptrloc ParentPkg; // Package + + unsigned short ID; +}; + struct pkgCache::Dependency { map_ptrloc Version; // Stringtable @@ -299,11 +339,13 @@ class pkgCache::Namespace typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; + typedef pkgCache::DescIterator DescIterator; typedef pkgCache::DepIterator DepIterator; typedef pkgCache::PrvIterator PrvIterator; typedef pkgCache::PkgFileIterator PkgFileIterator; typedef pkgCache::VerFileIterator VerFileIterator; typedef pkgCache::Version Version; + typedef pkgCache::Description Description; typedef pkgCache::Package Package; typedef pkgCache::Header Header; typedef pkgCache::Dep Dep; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index de854be..397c198 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgcachegen.h" -#endif - #define APT_COMPATIBILITY 986 #include @@ -26,6 +22,8 @@ #include #include +#include + #include #include @@ -125,16 +123,57 @@ bool pkgCacheGenerator::MergeList(ListParser &List, string Version = List.Version(); if (Version.empty() == true) { + // we first process the package, then the descriptions + // (this has the bonus that we get MMap error when we run out + // of MMap space) if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); + + // Find the right version to write the description + MD5SumValue CurMd5 = List.Description_md5(); + pkgCache::VerIterator Ver = Pkg.VersionList(); + map_ptrloc *LastVer = &Pkg->VersionList; + + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + { + pkgCache::DescIterator Desc = Ver.DescriptionList(); + map_ptrloc *LastDesc = &Ver->DescriptionList; + bool duplicate=false; + + // don't add a new description if we have one for the given + // md5 && language + for ( ; Desc.end() == false; Desc++) + if (MD5SumValue(Desc.md5()) == CurMd5 && + Desc.LanguageCode() == List.DescriptionLanguage()) + duplicate=true; + if(duplicate) + continue; + + for (Desc = Ver.DescriptionList(); + Desc.end() == false; + LastDesc = &Desc->NextDesc, Desc++) + { + if (MD5SumValue(Desc.md5()) == CurMd5) + { + // Add new description + *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + Desc->ParentPkg = Pkg.Index(); + + if (NewFileDesc(Desc,List) == false) + return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str()); + break; + } + } + } + continue; } pkgCache::VerIterator Ver = Pkg.VersionList(); - map_ptrloc *Last = &Pkg->VersionList; + map_ptrloc *LastVer = &Pkg->VersionList; int Res = 1; - for (; Ver.end() == false; Last = &Ver->NextVer, Ver++) + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res >= 0) @@ -168,7 +207,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // Skip to the end of the same version set. if (Res == 0) { - for (; Ver.end() == false; Last = &Ver->NextVer, Ver++) + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res != 0) @@ -177,9 +216,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } // Add a new version - *Last = NewVersion(Ver,Version,*Last); + *LastVer = NewVersion(Ver,Version,*LastVer); Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; + if (List.NewVersion(Ver) == false) return _error->Error(_("Error occurred while processing %s (NewVersion1)"), PackageName.c_str()); @@ -199,6 +239,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List, FoundFileDeps |= List.HasFileDeps(); return true; } + + /* Record the Description data. Description data always exist in + Packages and Translation-* files. */ + pkgCache::DescIterator Desc = Ver.DescriptionList(); + map_ptrloc *LastDesc = &Ver->DescriptionList; + + // Skip to the end of description set + for (; 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) + return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str()); } FoundFileDeps |= List.HasFileDeps(); @@ -209,6 +264,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1) return _error->Error(_("Wow, you exceeded the number of versions " "this APT is capable of.")); + if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1) + return _error->Error(_("Wow, you exceeded the number of descriptions " + "this APT is capable of.")); if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL) return _error->Error(_("Wow, you exceeded the number of dependencies " "this APT is capable of.")); @@ -271,7 +329,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name Pkg = Cache.FindPkg(Name); if (Pkg.end() == false) return true; - + // Get a structure unsigned long Package = Map.Allocate(sizeof(pkgCache::Package)); if (Package == 0) @@ -349,6 +407,63 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, return Version; } /*}}}*/ +// CacheGenerator::NewFileDesc - Create a new File<->Desc association /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, + ListParser &List) +{ + if (CurrentFile == 0) + return true; + + // Get a structure + unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile)); + if (DescFile == 0) + return 0; + + 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++) + Last = &D->NextFile; + + DF->NextFile = *Last; + *Last = DF.Index(); + + DF->Offset = List.Offset(); + DF->Size = List.Size(); + if (Cache.HeaderP->MaxDescFileSize < DF->Size) + Cache.HeaderP->MaxDescFileSize = DF->Size; + Cache.HeaderP->DescFileCount++; + + return true; +} + /*}}}*/ +// CacheGenerator::NewDescription - Create a new Description /*{{{*/ +// --------------------------------------------------------------------- +/* This puts a description structure in the linked list */ +map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, + const string &Lang, + const MD5SumValue &md5sum, + map_ptrloc Next) +{ + // Get a structure + map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description)); + if (Description == 0) + return 0; + + // Fill it in + Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); + Desc->NextDesc = Next; + Desc->ID = Cache.HeaderP->DescriptionCount++; + Desc->language_code = Map.WriteString(Lang); + Desc->md5sum = Map.WriteString(md5sum.Value()); + + return Description; +} + /*}}}*/ // ListParser::NewDepends - Create a dependency element /*{{{*/ // --------------------------------------------------------------------- /* This creates a dependency element in the tree. It is linked to the @@ -571,8 +686,10 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start, if ((*Start)->Exists() == false) { +#if 0 // mvo: we no longer give a message here (Default Sources spec) _error->WarningE("stat",_("Couldn't stat source package list %s"), (*Start)->Describe().c_str()); +#endif continue; } @@ -580,7 +697,7 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start, pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache); if (File.end() == true) return false; - + Visited[File->ID] = true; } @@ -676,7 +793,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap,bool AllowMem) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024); vector Files; for (vector::const_iterator i = List.begin(); @@ -823,7 +940,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, /* */ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",8*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 9a729ee..b671529 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -19,11 +19,9 @@ #ifndef PKGLIB_PKGCACHEGEN_H #define PKGLIB_PKGCACHEGEN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcachegen.h" -#endif #include +#include class pkgSourceList; class OpProgress; @@ -53,9 +51,11 @@ class pkgCacheGenerator // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); + bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); + map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); public: @@ -108,6 +108,9 @@ class pkgCacheGenerator::ListParser virtual string Package() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; + virtual string Description() = 0; + virtual string DescriptionLanguage() = 0; + virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; virtual bool UsePackage(pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver) = 0; diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 9c2655d..e506de7 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -9,9 +9,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgrecords.h" -#endif #include #include #include @@ -23,25 +20,23 @@ // Records::pkgRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This will create the necessary structures to access the status files */ -pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) +pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), + Files(Cache.HeaderP->PackageFileCount) { - Files = new Parser *[Cache.HeaderP->PackageFileCount]; - memset(Files,0,sizeof(*Files)*Cache.HeaderP->PackageFileCount); - - for (pkgCache::PkgFileIterator I = Cache.FileBegin(); - I.end() == false; I++) + for (pkgCache::PkgFileIterator I = Cache.FileBegin(); + I.end() == false; I++) { const pkgIndexFile::Type *Type = pkgIndexFile::Type::GetType(I.IndexType()); if (Type == 0) { - _error->Error(_("Index file type '%s' is not supported"),I.IndexType()); - return; + _error->Error(_("Index file type '%s' is not supported"),I.IndexType()); + return; } Files[I->ID] = Type->CreatePkgParser(I); if (Files[I->ID] == 0) - return; - } + return; + } } /*}}}*/ // Records::~pkgRecords - Destructor /*{{{*/ @@ -49,9 +44,12 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) /* */ pkgRecords::~pkgRecords() { - for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++) - delete Files[I]; - delete [] Files; + for ( vector::iterator it = Files.begin(); + it != Files.end(); + ++it) + { + delete *it; + } } /*}}}*/ // Records::Lookup - Get a parser for the package version file /*{{{*/ @@ -63,3 +61,12 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver) return *Files[Ver.File()->ID]; } /*}}}*/ +// Records::Lookup - Get a parser for the package description file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc) +{ + Files[Desc.File()->ID]->Jump(Desc); + return *Files[Desc.File()->ID]; +} + /*}}}*/ diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 08f0044..17f3b15 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -17,12 +17,10 @@ #ifndef PKGLIB_PKGRECORDS_H #define PKGLIB_PKGRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgrecords.h" -#endif #include #include +#include class pkgRecords { @@ -32,12 +30,13 @@ class pkgRecords private: pkgCache &Cache; - Parser **Files; - + std::vectorFiles; + public: // Lookup function Parser &Lookup(pkgCache::VerFileIterator const &Ver); + Parser &Lookup(pkgCache::DescFileIterator const &Desc); // Construct destruct pkgRecords(pkgCache &Cache); @@ -49,6 +48,7 @@ class pkgRecords::Parser protected: virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0; + virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0; public: friend class pkgRecords; @@ -57,13 +57,16 @@ class pkgRecords::Parser virtual string FileName() {return string();}; virtual string MD5Hash() {return string();}; virtual string SHA1Hash() {return string();}; + virtual string SHA256Hash() {return string();}; virtual string SourcePkg() {return string();}; + virtual string SourceVer() {return string();}; // These are some general stats about the package virtual string Maintainer() {return string();}; virtual string ShortDesc() {return string();}; virtual string LongDesc() {return string();}; virtual string Name() {return string();}; + virtual string Homepage() {return string();} // The record in binary form virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;}; diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc index 86174a4..6dd2d3e 100644 --- a/apt-pkg/pkgsystem.cc +++ b/apt-pkg/pkgsystem.cc @@ -10,13 +10,10 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgsystem.h" -#endif - #include #include #include +#include /*}}}*/ pkgSystem *_system = 0; diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index a7d5551..246762e 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -37,9 +37,6 @@ #ifndef PKGLIB_PKGSYSTEM_H #define PKGLIB_PKGSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgsystem.h" -#endif #include #include diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index d8b8825..8b083fd 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -23,9 +23,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/policy.h" -#endif #include #include #include @@ -36,6 +33,7 @@ #include #include +#include /*}}}*/ using namespace std; @@ -300,7 +298,13 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) continue; } - Plcy.CreatePin(Type,Name,string(Word,End),priority); + istringstream s(Name); + string pkg; + while(!s.eof()) + { + s >> pkg; + Plcy.CreatePin(Type, pkg, string(Word,End),priority); + }; } Plcy.InitDefaults(); diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 40ebd3f..d5f3b2f 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -33,9 +33,6 @@ #ifndef PKGLIB_POLICY_H #define PKGLIB_POLICY_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/policy.h" -#endif #include #include diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index e3b4d94..fea6450 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -8,10 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/sourcelist.h" -#endif - #include #include #include diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 123ae69..b9e4389 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -35,9 +35,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/sourcelist.h" -#endif class pkgAquire; class pkgSourceList diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 6cac477..5e40ae6 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -11,10 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/srcrecords.h" -#endif - #include #include #include diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 3e21125..99cbc60 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -13,9 +13,6 @@ #ifndef PKGLIB_SRCRECORDS_H #define PKGLIB_SRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/srcrecords.h" -#endif #include #include diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 223618c..893cb8e 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -11,10 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/tagfile.h" -#endif - #include #include #include @@ -423,6 +419,7 @@ static const char *iTFRewritePackageOrder[] = { "Recommends", "Suggests", "Conflicts", + "Breaks", "Conffiles", "Filename", "Size", diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 70381ad..6536932 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_TAGFILE_H #define PKGLIB_TAGFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/tagfile.h" -#endif #include #include @@ -33,8 +30,8 @@ class pkgTagSection const char *Stop; // We have a limit of 256 tags per section. - unsigned short Indexes[256]; - unsigned short AlphaIndexes[0x100]; + unsigned int Indexes[256]; + unsigned int AlphaIndexes[0x100]; unsigned int TagCount; diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc index d0392eb..2350afe 100644 --- a/apt-pkg/vendor.cc +++ b/apt-pkg/vendor.cc @@ -1,7 +1,3 @@ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/vendor.h" -#endif - #include #include #include diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h index 033bb96..2d39fd1 100644 --- a/apt-pkg/vendor.h +++ b/apt-pkg/vendor.h @@ -4,9 +4,6 @@ #include #include -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendor.h" -#endif using std::string; diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index 7f96fc7..ff2f4ed 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -21,9 +21,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendorlist.h" -#endif class pkgVendorList { diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc index db340c1..42e449d 100644 --- a/apt-pkg/version.cc +++ b/apt-pkg/version.cc @@ -8,10 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/version.h" -#endif - #include #include diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 071dba3..49c53a9 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/version.h" -#endif #include #include diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 9e34185..5c25c2f 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -11,9 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/versionmatch.h" -#endif #include #include @@ -127,7 +124,7 @@ bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix) const char *Ae = Ab + strlen(A); // Strings are not a compatible size. - if ((unsigned)(Ae - Ab) != B.length() && Prefix == false || + if (((unsigned)(Ae - Ab) != B.length() && Prefix == false) || (unsigned)(Ae - Ab) < B.length()) return false; diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index 7ca39cb..fe264aa 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_VERSIONMATCH_H #define PKGLIB_VERSIONMATCH_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/versionmatch.h" -#endif #include #include diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index a5b91b1..e7beceb 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -18,6 +18,8 @@ #else // apt will not use any gettext # define setlocale(a, b) +# define textdomain(a) +# define bindtextdomain(a, b) # define _(x) x # define N_(x) x #endif diff --git a/buildlib/archtable b/buildlib/archtable deleted file mode 100644 index 1975292..0000000 --- a/buildlib/archtable +++ /dev/null @@ -1,29 +0,0 @@ -# This file contains a table of known architecture strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with architecture -# (CPU) names. - -# The left side is a regex for awk - -i.86 i386 -pentium i386 -sparc sparc -sparc64 sparc -alpha.* alpha -m68k m68k -arm.*b armeb -arm.* arm -powerpc powerpc -ppc powerpc -powerpc64 ppc64 -mipsel mipsel -mipseb mips -mips mips -sheb sheb -shel sh -sh sh -hppa.* hppa -ia64 ia64 -s390 s390 -s390x s390x -x86_64 amd64 diff --git a/buildlib/config.guess b/buildlib/config.guess index 1127162..f32079a 100755 --- a/buildlib/config.guess +++ b/buildlib/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2003-10-07' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +18,15 @@ timestamp='2003-10-07' # # 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. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,8 +56,8 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -196,50 +200,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,42 +263,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -320,32 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -383,37 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -478,29 +475,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -508,7 +505,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -523,15 +520,19 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -544,28 +545,28 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -627,9 +628,19 @@ EOF esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -637,11 +648,11 @@ EOF fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -669,158 +680,192 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -837,8 +882,12 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -856,15 +905,22 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -878,7 +934,7 @@ EOF objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -886,25 +942,31 @@ EOF PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -922,15 +984,15 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -947,7 +1009,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -957,16 +1019,23 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -974,24 +1043,27 @@ EOF # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -999,15 +1071,16 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1099,68 +1172,81 @@ EOF else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1168,22 +1254,25 @@ EOF UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1194,28 +1283,47 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1247,7 +1355,7 @@ main () #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1336,11 +1444,12 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1349,22 +1458,22 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1375,7 +1484,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 8a65a22..eddb162 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -32,11 +32,8 @@ /* If there is no socklen_t, define this for the netdb shim */ #undef NEED_SOCKLEN_T_DEFINE -/* Define the cpu name string */ -#undef COMMON_CPU - -/* Define the on name string */ -#undef COMMON_OS +/* Define the arch name string */ +#undef COMMON_ARCH /* The version number string */ #undef VERSION diff --git a/buildlib/config.sub b/buildlib/config.sub index 79657cd..6759825 100755 --- a/buildlib/config.sub +++ b/buildlib/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2003-10-07' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ timestamp='2003-10-07' # # 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. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +85,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,7 +120,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +148,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -169,6 +173,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +193,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -229,14 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -245,6 +259,7 @@ case $basic_machine in | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -253,20 +268,24 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -277,6 +296,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -296,20 +318,20 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -318,6 +340,7 @@ case $basic_machine in | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -325,27 +348,35 @@ case $basic_machine in | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -362,6 +393,9 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -379,6 +413,9 @@ case $basic_machine in amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -410,6 +447,14 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -438,12 +483,27 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -466,6 +526,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -616,6 +680,14 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -631,6 +703,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -644,10 +720,6 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -660,6 +732,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -728,10 +803,6 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -739,9 +810,12 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -759,6 +833,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -768,6 +850,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -824,6 +912,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -850,6 +942,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -861,6 +957,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -950,6 +1049,10 @@ case $basic_machine in basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -963,6 +1066,10 @@ case $basic_machine in tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1006,6 +1113,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1036,6 +1147,9 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1052,13 +1166,10 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1131,19 +1242,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1161,7 +1276,7 @@ case $os in os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1182,6 +1297,9 @@ case $os in -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1203,6 +1321,9 @@ case $os in -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1225,6 +1346,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1261,6 +1385,9 @@ case $os in -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1283,6 +1410,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1292,9 +1425,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1320,6 +1453,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1338,9 +1474,15 @@ case $basic_machine in *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1473,9 +1615,15 @@ case $basic_machine in -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1500,7 +1648,7 @@ case $basic_machine in esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 15f4488..3ae11a7 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -1,6 +1,6 @@ # -*- make -*- -# This installs arbitary files into a directory +# This installs arbitrary files into a directory # Input # $(SOURCE) - The documents to use diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak index 0c20dc9..f334741 100644 --- a/buildlib/debiandoc.mak +++ b/buildlib/debiandoc.mak @@ -27,7 +27,7 @@ vpath %.sgml $(SUBDIRS) $(DOC)/%.html: %.sgml echo Creating html for $< to $@ -rm -rf $@ - (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $$HERE/$<) + (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) # Clean rule .PHONY: veryclean/html/$(LOCAL) diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 193631a..2a9cc69 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -28,6 +28,8 @@ INLINEDEPFLAG = -MD DEBIANDOC_HTML = @DEBIANDOC_HTML@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ +DOXYGEN = @DOXYGEN@ + # SGML for the man pages DOCBOOK2MAN := @DOCBOOK2MAN@ @@ -53,6 +55,7 @@ PYTHONEXECPREFIX = @PYTHONEXECPREFIX@ PYTHONINCLUDE = @PYTHONINCLUDE@ BDBLIB = @BDBLIB@ INTLLIBS = @INTLLIBS@ +LIBICONV = @LIBICONV@ # Shim Headerfile control HAVE_C9X = @HAVE_C9X@ @@ -62,11 +65,17 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ # Shared library things HOST_OS = @host_os@ -#ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) - SONAME_MAGIC= +ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + SOEXT=so +else +ifneq ($(words $(filter darwin%,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-dylib_install_name, LFLAGS_SO= -#else + SOEXT=dylib +else # Do not know how to create shared libraries here. -# ONLYSTATICLIBS = yes -#endif - + ONLYSTATICLIBS = yes +endif +endif diff --git a/buildlib/environment.mak.in.orig b/buildlib/environment.mak.in.orig new file mode 100644 index 0000000..df8f3ff --- /dev/null +++ b/buildlib/environment.mak.in.orig @@ -0,0 +1,75 @@ +# This file contains everything that autoconf guessed for your system. +# if you want you can edit it, just don't re-run configure. + +PACKAGE = @PACKAGE@ + +# C++ compiler options +CC = @CC@ +CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall +CXX = @CXX@ +CXXFLAGS+= @CXXFLAGS@ +NUM_PROCS = @NUM_PROCS@ +GLIBC_VER = @GLIBC_VER@ +LIBSTDCPP_VER = @LIBSTDCPP_VER@ + +# Linker stuff +PICFLAGS+= -fPIC -DPIC +LFLAGS+= @LDFLAGS@ +LEFLAGS+= +SOCKETLIBS:= @SOCKETLIBS@ +AR:=@AR@ +RANLIB:=@RANLIB@ + +# Dep generation - this only works for gnu stuff +GCC3DEP = @GCC3DEP@ +INLINEDEPFLAG = -MD + +# Debian doc stuff +DEBIANDOC_HTML = @DEBIANDOC_HTML@ +DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ + +DOXYGEN = @DOXYGEN@ + +# SGML for the man pages +DOCBOOK2MAN := @DOCBOOK2MAN@ + +# XML for the man pages +XMLTO := @XMLTO@ + +# XML for the man pages +XMLTO := @XMLTO@ + +# Gettext settings +GMSGFMT = @GMSGFMT@ +XGETTEXT = @XGETTEXT@ +MSGCOMM:=$(dir $(XGETTEXT))/msgcomm +MSGMERGE:=$(dir $(XGETTEXT))/msgmerge +BASH = @BASH@ + +# Various library checks +PTHREADLIB = @PTHREADLIB@ +PYTHONLIB = @PYTHONLIB@ +PYTHONVER = @PYTHONVER@ +PYTHONPREFIX = @PYTHONPREFIX@ +PYTHONEXECPREFIX = @PYTHONEXECPREFIX@ +PYTHONINCLUDE = @PYTHONINCLUDE@ +BDBLIB = @BDBLIB@ +INTLLIBS = @INTLLIBS@ +LIBICONV = @LIBICONV@ + +# Shim Headerfile control +HAVE_C9X = @HAVE_C9X@ +HAVE_STATVFS = @HAVE_STATVFS@ +HAVE_TIMEGM = @HAVE_TIMEGM@ +NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@ + +# Shared library things +HOST_OS = @host_os@ +ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= +else + # Do not know how to create shared libraries here. + ONLYSTATICLIBS = yes +endif + diff --git a/buildlib/inttypes.h.in b/buildlib/inttypes.h.in index 3be7207..3b43b76 100644 --- a/buildlib/inttypes.h.in +++ b/buildlib/inttypes.h.in @@ -4,6 +4,13 @@ #include +#undef int32_t +#undef uint32_t +#undef int16_t +#undef uint16_t +#undef int8_t +#undef uint8_t + /* Generate the fixed bit size types */ #if SIZEOF_INT == 4 typedef int int32_t; diff --git a/buildlib/library.mak b/buildlib/library.mak index e551581..8d78433 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -16,11 +16,11 @@ # See defaults.mak for information about LOCAL # Some local definitions -LOCAL := lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR).$(MINOR) +LOCAL := lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR).$(MINOR) $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE))))) $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE))))) $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS)) -$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR) +$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR) $(LOCAL)-SLIBS := $(SLIBS) $(LOCAL)-LIBRARY := $(LIBRARY) @@ -29,7 +29,7 @@ include $(PODOMAIN_H) # Install the command hooks headers: $($(LOCAL)-HEADERS) -library: $(LIB)/lib$(LIBRARY).dylib $(LIB)/lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR) +library: $(LIB)/lib$(LIBRARY).$(SOEXT) $(LIB)/lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR) clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) @@ -41,21 +41,21 @@ MKDIRS += $(OBJ) $(DEP) $(LIB) $(dir $($(LOCAL)-HEADERS)) clean/$(LOCAL): -rm -f $($(@F)-OBJS) $($(@F)-DEP) veryclean/$(LOCAL): clean/$(LOCAL) - -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.dylib* + -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.$(SOEXT)* # Build rules for the two symlinks -.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR) $(LIB)/lib$(LIBRARY).dylib -$(LIB)/lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).dylib.$(MAJOR).$(MINOR) +.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR) $(LIB)/lib$(LIBRARY).$(SOEXT) +$(LIB)/lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR).$(MINOR) ln -sf $( /dev/null +$(LIB)/lib$(LIBRARY)$(LIBEXT).$(SOEXT).$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) + -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.$(SOEXT)* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ - -o $@ -Wl,-dylib_install_name,$(patsubst $(LIB)/%,/usr/lib/%,$@) -dynamiclib \ + -o $@ $(SONAME_MAGIC)$(patsubst $(LIB)/%,/usr/lib/%,$@) -dynamiclib \ $(filter %.opic,$^) \ $($(@F)-SLIBS) diff --git a/buildlib/ostable b/buildlib/ostable deleted file mode 100644 index 091faf8..0000000 --- a/buildlib/ostable +++ /dev/null @@ -1,23 +0,0 @@ -# This file contains a table of known vendor-os strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with -# OS names. The right should be a common name like the arch table -# generates -# The final bit to build the Debian Architecture is done in init.cc -# The left side is a regex for awk, and the first match is used. - -# These are used by Debian -[^-]*-linux-.* linux -[^-]*-kfreebsd.*-gnu kfreebsd -[^-]*-knetbsd.*-gnu knetbsd -[^-]*-gnu[^-]* hurd -[^-]*-darwin9 iphoneos -[^-]*-darwin darwin - -# These are samples. -hp-hpux[^-]* hp-ux -sun-solaris[^-]* solaris -[^-]*-openbsd[^-]* openbsd - -# Catch all -.* unknown diff --git a/buildlib/sizetable b/buildlib/sizetable index 8b18528..b578236 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -21,3 +21,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 +m32r big 1 4 2 4 \ No newline at end of file diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 363148e..febe08c 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $ @@ -75,6 +71,12 @@ void LocalitySort(pkgCache::VerFile **begin, { qsort(begin,Count,Size,LocalityCompare); } + +void LocalitySort(pkgCache::DescFile **begin, + unsigned long Count,size_t Size) +{ + qsort(begin,Count,Size,LocalityCompare); +} /*}}}*/ // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- @@ -100,13 +102,15 @@ bool UnMet(CommandLine &CmdL) if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) + End->Type != pkgCache::Dep::Recommends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends) + End->Type != pkgCache::Dep::Depends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Verify the or group @@ -186,7 +190,14 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr(); for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++) - cout << "(" << Vf.File().FileName() << ")"; + cout << " (" << Vf.File().FileName() << ")"; + cout << endl; + for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; D++) + { + cout << " Description Language: " << D.LanguageCode() << endl + << " File: " << D.FileList().File().FileName() << endl + << " MD5: " << D.md5() << endl; + } cout << endl; } @@ -233,7 +244,7 @@ bool DumpPackage(CommandLine &CmdL) bool Stats(CommandLine &Cmd) { pkgCache &Cache = *GCache; - cout << _("Total package names : ") << Cache.Head().PackageCount << " (" << + cout << _("Total package names: ") << Cache.Head().PackageCount << " (" << SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; int Normal = 0; @@ -281,11 +292,15 @@ bool Stats(CommandLine &Cmd) cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; + cout << _("Total distinct descriptions: ") << Cache.Head().DescriptionCount << " (" << + SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl; cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" << SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl; + cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" << + SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl; cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" << SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl; @@ -348,6 +363,12 @@ bool Dump(CommandLine &Cmd) for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) cout << " Depends: " << D.TargetPkg().Name() << ' ' << DeNull(D.TargetVer()) << endl; + for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++) + { + cout << " Description Language: " << D.LanguageCode() << endl + << " File: " << D.FileList().File().FileName() << endl + << " MD5: " << D.md5() << endl; + } } } @@ -850,6 +871,7 @@ bool XVcg(CommandLine &CmdL) then show the relation but do not recurse */ if (Hit == false && (D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes)) { if (Show[D.TargetPkg()->ID] == None && @@ -871,6 +893,9 @@ bool XVcg(CommandLine &CmdL) case pkgCache::Dep::Conflicts: printf("label: \"conflicts\" color: lightgreen }\n"); break; + case pkgCache::Dep::DpkgBreaks: + printf("label: \"breaks\" color: lightgreen }\n"); + break; case pkgCache::Dep::Obsoletes: printf("label: \"obsoletes\" color: lightgreen }\n"); break; @@ -1196,17 +1221,50 @@ bool DisplayRecord(pkgCache::VerIterator V) if (_error->PendingError() == true) return false; - // Read the record and then write it out again. + // Read the record unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; if (PkgF.Seek(V.FileList()->Offset) == false || - PkgF.Read(Buffer,V.FileList()->Size) == false || - fwrite(Buffer,1,V.FileList()->Size+1,stdout) < (size_t)(V.FileList()->Size+1)) + PkgF.Read(Buffer,V.FileList()->Size) == false) { delete [] Buffer; return false; } - + + // Get a pointer to start of Description field + const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:"); + + // Write all but Description + if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer)) + { + delete [] Buffer; + return false; + } + + // Show the right description + pkgRecords Recs(*GCache); + pkgCache::DescIterator Desc = V.TranslatedDescription(); + pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); + cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc(); + + // Find the first field after the description (if there is any) + for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++) + { + if(*DescP == '\n' && *(DescP+1) != ' ') + { + // write the rest of the buffer + const unsigned char *end=&Buffer[V.FileList()->Size]; + if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) + { + delete [] Buffer; + return false; + } + + break; + } + } + // write a final newline (after the description) + cout<PackageCount+1]; - memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1); + ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1); // Map versions that we want to write out onto the VerList array. for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - VFList[P->ID].NameMatch = NumPatterns != 0; + DFList[P->ID].NameMatch = NumPatterns != 0; for (unsigned I = 0; I != NumPatterns; I++) { if (regexec(&Patterns[I],P.Name(),0,0,0) == 0) - VFList[P->ID].NameMatch &= true; + DFList[P->ID].NameMatch &= true; else - VFList[P->ID].NameMatch = false; + DFList[P->ID].NameMatch = false; } // Doing names only, drop any that dont match.. - if (NamesOnly == true && VFList[P->ID].NameMatch == false) + if (NamesOnly == true && DFList[P->ID].NameMatch == false) continue; // Find the proper version to use. pkgCache::VerIterator V = Plcy.GetCandidateVer(P); if (V.end() == false) - VFList[P->ID].Vf = V.FileList(); + DFList[P->ID].Df = V.DescriptionList().FileList(); } // Include all the packages that provide matching names too for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - if (VFList[P->ID].NameMatch == false) + if (DFList[P->ID].NameMatch == false) continue; for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) @@ -1293,18 +1351,18 @@ bool Search(CommandLine &CmdL) pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); if (V.end() == false) { - VFList[Prv.OwnerPkg()->ID].Vf = V.FileList(); - VFList[Prv.OwnerPkg()->ID].NameMatch = true; + DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList(); + DFList[Prv.OwnerPkg()->ID].NameMatch = true; } } } - - LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList)); + + LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList)); // Iterate over all the version records and check them - for (ExVerFile *J = VFList; J->Vf != 0; J++) + for (ExDescFile *J = DFList; J->Df != 0; J++) { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf)); + pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); bool Match = true; if (J->NameMatch == false) @@ -1335,7 +1393,7 @@ bool Search(CommandLine &CmdL) } } - delete [] VFList; + delete [] DFList; for (unsigned I = 0; I != NumPatterns; I++) regfree(&Patterns[I]); if (ferror(stdout)) @@ -1653,8 +1711,8 @@ bool GenCaches(CommandLine &Cmd) /* */ bool ShowHelp(CommandLine &Cmd) { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; @@ -1681,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" - " dotty - Generate package graphs for GraphVis\n" + " pkgnames - List the names of all packages in the system\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -1710,15 +1768,6 @@ void CacheInitialize() int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/cmdline/apt-cache.cc.orig b/cmdline/apt-cache.cc.orig deleted file mode 100644 index 07c82c9..0000000 --- a/cmdline/apt-cache.cc.orig +++ /dev/null @@ -1,1826 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $ -/* ###################################################################### - - apt-cache - Manages the cache files - - apt-cache provides some functions fo manipulating the cache files. - It uses the command line interface common to all the APT tools. - - Returns 100 on failure, 0 on success. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - /*}}}*/ - -using namespace std; - -pkgCache *GCache = 0; -pkgSourceList *SrcList = 0; - -// LocalitySort - Sort a version list by package file locality /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int LocalityCompare(const void *a, const void *b) -{ - pkgCache::VerFile *A = *(pkgCache::VerFile **)a; - pkgCache::VerFile *B = *(pkgCache::VerFile **)b; - - if (A == 0 && B == 0) - return 0; - if (A == 0) - return 1; - if (B == 0) - return -1; - - if (A->File == B->File) - return A->Offset - B->Offset; - return A->File - B->File; -} - -void LocalitySort(pkgCache::VerFile **begin, - unsigned long Count,size_t Size) -{ - qsort(begin,Count,Size,LocalityCompare); -} - /*}}}*/ -// UnMet - Show unmet dependencies /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool UnMet(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - bool Important = _config->FindB("APT::Cache::Important",false); - - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) - { - bool Header = false; - for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;) - { - // Collect or groups - pkgCache::DepIterator Start; - pkgCache::DepIterator End; - D.GlobOr(Start,End); - - // Skip conflicts and replaces - if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends && - End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) - continue; - - // Important deps only - if (Important == true) - if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends) - continue; - - // Verify the or group - bool OK = false; - pkgCache::DepIterator RealStart = Start; - do - { - // See if this dep is Ok - pkgCache::Version **VList = Start.AllTargets(); - if (*VList != 0) - { - OK = true; - delete [] VList; - break; - } - delete [] VList; - - if (Start == End) - break; - Start++; - } - while (1); - - // The group is OK - if (OK == true) - continue; - - // Oops, it failed.. - if (Header == false) - ioprintf(cout,_("Package %s version %s has an unmet dep:\n"), - P.Name(),V.VerStr()); - Header = true; - - // Print out the dep type - cout << " " << End.DepType() << ": "; - - // Show the group - Start = RealStart; - do - { - cout << Start.TargetPkg().Name(); - if (Start.TargetVer() != 0) - cout << " (" << Start.CompType() << " " << Start.TargetVer() << - ")"; - if (Start == End) - break; - cout << " | "; - Start++; - } - while (1); - - cout << endl; - } - } - } - return true; -} - /*}}}*/ -// DumpPackage - Show a dump of a package record /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DumpPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - - cout << "Package: " << Pkg.Name() << endl; - cout << "Versions: " << endl; - for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) - { - cout << Cur.VerStr(); - for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++) - cout << "(" << Vf.File().FileName() << ")"; - cout << endl; - } - - cout << endl; - - cout << "Reverse Depends: " << endl; - for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++) - { - cout << " " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name(); - if (D->Version != 0) - cout << ' ' << DeNull(D.TargetVer()) << endl; - else - cout << endl; - } - - cout << "Dependencies: " << endl; - for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) - { - cout << Cur.VerStr() << " - "; - for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++) - cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") "; - cout << endl; - } - - cout << "Provides: " << endl; - for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) - { - cout << Cur.VerStr() << " - "; - for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.ParentPkg().Name() << " "; - cout << endl; - } - cout << "Reverse Provides: " << endl; - for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr() << endl; - } - - return true; -} - /*}}}*/ -// Stats - Dump some nice statistics /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Stats(CommandLine &Cmd) -{ - pkgCache &Cache = *GCache; - cout << _("Total package names : ") << Cache.Head().PackageCount << " (" << - SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; - - int Normal = 0; - int Virtual = 0; - int NVirt = 0; - int DVirt = 0; - int Missing = 0; - pkgCache::PkgIterator I = Cache.PkgBegin(); - for (;I.end() != true; I++) - { - if (I->VersionList != 0 && I->ProvidesList == 0) - { - Normal++; - continue; - } - - if (I->VersionList != 0 && I->ProvidesList != 0) - { - NVirt++; - continue; - } - - if (I->VersionList == 0 && I->ProvidesList != 0) - { - // Only 1 provides - if (I.ProvidesList()->NextProvides == 0) - { - DVirt++; - } - else - Virtual++; - continue; - } - if (I->VersionList == 0 && I->ProvidesList == 0) - { - Missing++; - continue; - } - } - cout << _(" Normal packages: ") << Normal << endl; - cout << _(" Pure virtual packages: ") << Virtual << endl; - cout << _(" Single virtual packages: ") << DVirt << endl; - cout << _(" Mixed virtual packages: ") << NVirt << endl; - cout << _(" Missing: ") << Missing << endl; - - cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << - SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; - cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << - SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; - - cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" << - SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl; - cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" << - SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl; - - // String list stats - unsigned long Size = 0; - unsigned long Count = 0; - for (pkgCache::StringItem *I = Cache.StringItemP + Cache.Head().StringList; - I!= Cache.StringItemP; I = Cache.StringItemP + I->NextItem) - { - Count++; - Size += strlen(Cache.StrP + I->String) + 1; - } - cout << _("Total globbed strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl; - - unsigned long DepVerSize = 0; - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) - { - for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) - { - if (D->Version != 0) - DepVerSize += strlen(D.TargetVer()) + 1; - } - } - } - cout << _("Total dependency version space: ") << SizeToStr(DepVerSize) << endl; - - unsigned long Slack = 0; - for (int I = 0; I != 7; I++) - Slack += Cache.Head().Pools[I].ItemSize*Cache.Head().Pools[I].Count; - cout << _("Total slack space: ") << SizeToStr(Slack) << endl; - - unsigned long Total = 0; - Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + - Cache.Head().VersionCount*Cache.Head().VersionSz + - Cache.Head().PackageCount*Cache.Head().PackageSz + - Cache.Head().VerFileCount*Cache.Head().VerFileSz + - Cache.Head().ProvidesCount*Cache.Head().ProvidesSz; - cout << _("Total space accounted for: ") << SizeToStr(Total) << endl; - - return true; -} - /*}}}*/ -// Dump - show everything /*{{{*/ -// --------------------------------------------------------------------- -/* This is worthless except fer debugging things */ -bool Dump(CommandLine &Cmd) -{ - pkgCache &Cache = *GCache; - cout << "Using Versioning System: " << Cache.VS->Label << endl; - - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - cout << "Package: " << P.Name() << endl; - for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) - { - cout << " Version: " << V.VerStr() << endl; - cout << " File: " << V.FileList().File().FileName() << endl; - for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) - cout << " Depends: " << D.TargetPkg().Name() << ' ' << - DeNull(D.TargetVer()) << endl; - } - } - - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) - { - cout << "File: " << F.FileName() << endl; - cout << " Type: " << F.IndexType() << endl; - cout << " Size: " << F->Size << endl; - cout << " ID: " << F->ID << endl; - cout << " Flags: " << F->Flags << endl; - cout << " Time: " << TimeRFC1123(F->mtime) << endl; - cout << " Archive: " << DeNull(F.Archive()) << endl; - cout << " Component: " << DeNull(F.Component()) << endl; - cout << " Version: " << DeNull(F.Version()) << endl; - cout << " Origin: " << DeNull(F.Origin()) << endl; - cout << " Site: " << DeNull(F.Site()) << endl; - cout << " Label: " << DeNull(F.Label()) << endl; - cout << " Architecture: " << DeNull(F.Architecture()) << endl; - } - - return true; -} - /*}}}*/ -// DumpAvail - Print out the available list /*{{{*/ -// --------------------------------------------------------------------- -/* This is needed to make dpkg --merge happy.. I spent a bit of time to - make this run really fast, perhaps I went a little overboard.. */ -bool DumpAvail(CommandLine &Cmd) -{ - pkgCache &Cache = *GCache; - - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) - return false; - - unsigned long Count = Cache.HeaderP->PackageCount+1; - pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count]; - memset(VFList,0,sizeof(*VFList)*Count); - - // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - if (P->VersionList == 0) - continue; - - /* Find the proper version to use. If the policy says there are no - possible selections we return the installed version, if available.. - This prevents dselect from making it obsolete. */ - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); - if (V.end() == true) - { - if (P->CurrentVer == 0) - continue; - V = P.CurrentVer(); - } - - pkgCache::VerFileIterator VF = V.FileList(); - for (; VF.end() == false ; VF++) - if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0) - break; - - /* Okay, here we have a bit of a problem.. The policy has selected the - currently installed package - however it only exists in the - status file.. We need to write out something or dselect will mark - the package as obsolete! Thus we emit the status file entry, but - below we remove the status line to make it valid for the - available file. However! We only do this if their do exist *any* - non-source versions of the package - that way the dselect obsolete - handling works OK. */ - if (VF.end() == true) - { - for (pkgCache::VerIterator Cur = P.VersionList(); Cur.end() != true; Cur++) - { - for (VF = Cur.FileList(); VF.end() == false; VF++) - { - if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 0) - { - VF = V.FileList(); - break; - } - } - - if (VF.end() == false) - break; - } - } - - VFList[P->ID] = VF; - } - - LocalitySort(VFList,Count,sizeof(*VFList)); - - // Iterate over all the package files and write them out. - char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10]; - for (pkgCache::VerFile **J = VFList; *J != 0;) - { - pkgCache::PkgFileIterator File(Cache,(*J)->File + Cache.PkgFileP); - if (File.IsOk() == false) - { - _error->Error(_("Package file %s is out of sync."),File.FileName()); - break; - } - - FileFd PkgF(File.FileName(),FileFd::ReadOnly); - if (_error->PendingError() == true) - break; - - /* Write all of the records from this package file, since we - already did locality sorting we can now just seek through the - file in read order. We apply 1 more optimization here, since often - there will be < 1 byte gaps between records (for the \n) we read that - into the next buffer and offset a bit.. */ - unsigned long Pos = 0; - for (; *J != 0; J++) - { - if ((*J)->File + Cache.PkgFileP != File) - break; - - const pkgCache::VerFile &VF = **J; - - // Read the record and then write it out again. - unsigned long Jitter = VF.Offset - Pos; - if (Jitter > 8) - { - if (PkgF.Seek(VF.Offset) == false) - break; - Jitter = 0; - } - - if (PkgF.Read(Buffer,VF.Size + Jitter) == false) - break; - Buffer[VF.Size + Jitter] = '\n'; - - // See above.. - if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource) - { - pkgTagSection Tags; - TFRewriteData RW[] = {{"Status",0},{"Config-Version",0},{}}; - const char *Zero = 0; - if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false || - TFRewrite(stdout,Tags,&Zero,RW) == false) - { - _error->Error("Internal Error, Unable to parse a package record"); - break; - } - fputc('\n',stdout); - } - else - { - if (fwrite(Buffer+Jitter,VF.Size+1,1,stdout) != 1) - break; - } - - Pos = VF.Offset + VF.Size; - } - - fflush(stdout); - if (_error->PendingError() == true) - break; - } - - delete [] Buffer; - delete [] VFList; - return !_error->PendingError(); -} - /*}}}*/ -// Depends - Print out a dependency tree /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Depends(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - Colours[Pkg->ID] = 1; - } - - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); - bool DidSomething; - do - { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.Name() << '>' << endl; - continue; - } - - cout << Pkg.Name() << endl; - - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) - { - - pkgCache::PkgIterator Trg = D.TargetPkg(); - - if((Installed && Trg->CurrentVer != 0) || !Installed) - { - - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) - cout << " |"; - else - cout << " "; - - // Show the package - if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; - else - cout << D.DepType() << ": " << Trg.Name() << endl; - - if (Recurse == true) - Colours[D.TargetPkg()->ID]++; - - } - - // Display all solutions - SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); - for (pkgCache::Version **I = List; *I != 0; I++) - { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || - V->ParentPkg == D->Package) - continue; - cout << " " << V.ParentPkg().Name() << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - } - } - } - } - while (DidSomething == true); - - return true; -} - -// RDepends - Print out a reverse dependency tree - mbc /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool RDepends(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - Colours[Pkg->ID] = 1; - } - - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); - bool DidSomething; - do - { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.Name() << '>' << endl; - continue; - } - - cout << Pkg.Name() << endl; - - cout << "Reverse Depends:" << endl; - for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) - { - // Show the package - pkgCache::PkgIterator Trg = D.ParentPkg(); - - if((Installed && Trg->CurrentVer != 0) || !Installed) - { - - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) - cout << " |"; - else - cout << " "; - - if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; - else - cout << Trg.Name() << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - - } - - // Display all solutions - SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); - for (pkgCache::Version **I = List; *I != 0; I++) - { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || - V->ParentPkg == D->Package) - continue; - cout << " " << V.ParentPkg().Name() << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - } - } - } - } - while (DidSomething == true); - - return true; -} - - /*}}}*/ - - -// xvcg - Generate a graph for xvcg /*{{{*/ -// --------------------------------------------------------------------- -// Code contributed from Junichi Uekawa on 20 June 2002. - -bool XVcg(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); - - /* Normal packages are boxes - Pure Provides are triangles - Mixed are diamonds - rhomb are missing packages*/ - const char *Shapes[] = {"ellipse","triangle","box","rhomb"}; - - /* Initialize the list of packages to show. - 1 = To Show - 2 = To Show no recurse - 3 = Emitted no recurse - 4 = Emitted - 0 = None */ - enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; - enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; - - // Show everything if no arguments given - if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) - Show[I] = ToShow; - else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) - Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); - - // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Pkg->VersionList == 0) - { - // Missing - if (Pkg->ProvidesList == 0) - ShapeMap[Pkg->ID] = 0; - else - ShapeMap[Pkg->ID] = 1; - } - else - { - // Normal - if (Pkg->ProvidesList == 0) - ShapeMap[Pkg->ID] = 2; - else - ShapeMap[Pkg->ID] = 3; - } - } - - // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; - } - - // Little header - cout << "graph: { title: \"packages\"" << endl << - "xmax: 700 ymax: 700 x: 30 y: 30" << endl << - "layout_downfactor: 8" << endl; - - bool Act = true; - while (Act == true) - { - Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - // See we need to show this package - if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) - continue; - - //printf ("node: { title: \"%s\" label: \"%s\" }\n", Pkg.Name(), Pkg.Name()); - - // Colour as done - if (Show[Pkg->ID] == ToShowNR || (Flags[Pkg->ID] & ForceNR) == ForceNR) - { - // Pure Provides and missing packages have no deps! - if (ShapeMap[Pkg->ID] == 0 || ShapeMap[Pkg->ID] == 1) - Show[Pkg->ID] = Done; - else - Show[Pkg->ID] = DoneNR; - } - else - Show[Pkg->ID] = Done; - Act = true; - - // No deps to map out - if (Pkg->VersionList == 0 || Show[Pkg->ID] == DoneNR) - continue; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) - { - // See if anything can meet this dep - // Walk along the actual package providing versions - bool Hit = false; - pkgCache::PkgIterator DPkg = D.TargetPkg(); - for (pkgCache::VerIterator I = DPkg.VersionList(); - I.end() == false && Hit == false; I++) - { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) - Hit = true; - } - - // Follow all provides - for (pkgCache::PrvIterator I = DPkg.ProvidesList(); - I.end() == false && Hit == false; I++) - { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) - Hit = true; - } - - - // Only graph critical deps - if (D.IsCritical() == true) - { - printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.Name(), D.TargetPkg().Name() ); - - // Colour the node for recursion - if (Show[D.TargetPkg()->ID] <= DoneNR) - { - /* If a conflicts does not meet anything in the database - then show the relation but do not recurse */ - if (Hit == false && - (D->Type == pkgCache::Dep::Conflicts || - D->Type == pkgCache::Dep::Obsoletes)) - { - if (Show[D.TargetPkg()->ID] == None && - Show[D.TargetPkg()->ID] != ToShow) - Show[D.TargetPkg()->ID] = ToShowNR; - } - else - { - if (GivenOnly == true && Show[D.TargetPkg()->ID] != ToShow) - Show[D.TargetPkg()->ID] = ToShowNR; - else - Show[D.TargetPkg()->ID] = ToShow; - } - } - - // Edge colour - switch(D->Type) - { - case pkgCache::Dep::Conflicts: - printf("label: \"conflicts\" color: lightgreen }\n"); - break; - case pkgCache::Dep::Obsoletes: - printf("label: \"obsoletes\" color: lightgreen }\n"); - break; - - case pkgCache::Dep::PreDepends: - printf("label: \"predepends\" color: blue }\n"); - break; - - default: - printf("}\n"); - break; - } - } - } - } - } - - /* Draw the box colours after the fact since we can not tell what colour - they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Show[Pkg->ID] < DoneNR) - continue; - - if (Show[Pkg->ID] == DoneNR) - printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.Name(), Pkg.Name(), - Shapes[ShapeMap[Pkg->ID]]); - else - printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.Name(), Pkg.Name(), - Shapes[ShapeMap[Pkg->ID]]); - - } - - printf("}\n"); - return true; -} - /*}}}*/ - - -// Dotty - Generate a graph for Dotty /*{{{*/ -// --------------------------------------------------------------------- -/* Dotty is the graphvis program for generating graphs. It is a fairly - simple queuing algorithm that just writes dependencies and nodes. - http://www.research.att.com/sw/tools/graphviz/ */ -bool Dotty(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); - - /* Normal packages are boxes - Pure Provides are triangles - Mixed are diamonds - Hexagons are missing packages*/ - const char *Shapes[] = {"hexagon","triangle","box","diamond"}; - - /* Initialize the list of packages to show. - 1 = To Show - 2 = To Show no recurse - 3 = Emitted no recurse - 4 = Emitted - 0 = None */ - enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; - enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; - - // Show everything if no arguments given - if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) - Show[I] = ToShow; - else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) - Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); - - // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Pkg->VersionList == 0) - { - // Missing - if (Pkg->ProvidesList == 0) - ShapeMap[Pkg->ID] = 0; - else - ShapeMap[Pkg->ID] = 1; - } - else - { - // Normal - if (Pkg->ProvidesList == 0) - ShapeMap[Pkg->ID] = 2; - else - ShapeMap[Pkg->ID] = 3; - } - } - - // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; - } - - // Little header - printf("digraph packages {\n"); - printf("concentrate=true;\n"); - printf("size=\"30,40\";\n"); - - bool Act = true; - while (Act == true) - { - Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - // See we need to show this package - if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) - continue; - - // Colour as done - if (Show[Pkg->ID] == ToShowNR || (Flags[Pkg->ID] & ForceNR) == ForceNR) - { - // Pure Provides and missing packages have no deps! - if (ShapeMap[Pkg->ID] == 0 || ShapeMap[Pkg->ID] == 1) - Show[Pkg->ID] = Done; - else - Show[Pkg->ID] = DoneNR; - } - else - Show[Pkg->ID] = Done; - Act = true; - - // No deps to map out - if (Pkg->VersionList == 0 || Show[Pkg->ID] == DoneNR) - continue; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) - { - // See if anything can meet this dep - // Walk along the actual package providing versions - bool Hit = false; - pkgCache::PkgIterator DPkg = D.TargetPkg(); - for (pkgCache::VerIterator I = DPkg.VersionList(); - I.end() == false && Hit == false; I++) - { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) - Hit = true; - } - - // Follow all provides - for (pkgCache::PrvIterator I = DPkg.ProvidesList(); - I.end() == false && Hit == false; I++) - { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) - Hit = true; - } - - // Only graph critical deps - if (D.IsCritical() == true) - { - printf("\"%s\" -> \"%s\"",Pkg.Name(),D.TargetPkg().Name()); - - // Colour the node for recursion - if (Show[D.TargetPkg()->ID] <= DoneNR) - { - /* If a conflicts does not meet anything in the database - then show the relation but do not recurse */ - if (Hit == false && - (D->Type == pkgCache::Dep::Conflicts || - D->Type == pkgCache::Dep::Obsoletes)) - { - if (Show[D.TargetPkg()->ID] == None && - Show[D.TargetPkg()->ID] != ToShow) - Show[D.TargetPkg()->ID] = ToShowNR; - } - else - { - if (GivenOnly == true && Show[D.TargetPkg()->ID] != ToShow) - Show[D.TargetPkg()->ID] = ToShowNR; - else - Show[D.TargetPkg()->ID] = ToShow; - } - } - - // Edge colour - switch(D->Type) - { - case pkgCache::Dep::Conflicts: - case pkgCache::Dep::Obsoletes: - printf("[color=springgreen];\n"); - break; - - case pkgCache::Dep::PreDepends: - printf("[color=blue];\n"); - break; - - default: - printf(";\n"); - break; - } - } - } - } - } - - /* Draw the box colours after the fact since we can not tell what colour - they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Show[Pkg->ID] < DoneNR) - continue; - - // Orange box for early recursion stoppage - if (Show[Pkg->ID] == DoneNR) - printf("\"%s\" [color=orange,shape=%s];\n",Pkg.Name(), - Shapes[ShapeMap[Pkg->ID]]); - else - printf("\"%s\" [shape=%s];\n",Pkg.Name(), - Shapes[ShapeMap[Pkg->ID]]); - } - - printf("}\n"); - return true; -} - /*}}}*/ -// DoAdd - Perform an adding operation /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DoAdd(CommandLine &CmdL) -{ - return _error->Error("Unimplemented"); -#if 0 - // Make sure there is at least one argument - if (CmdL.FileSize() <= 1) - return _error->Error("You must give at least one file name"); - - // Open the cache - FileFd CacheF(_config->FindFile("Dir::Cache::pkgcache"),FileFd::WriteAny); - if (_error->PendingError() == true) - return false; - - DynamicMMap Map(CacheF,MMap::Public); - if (_error->PendingError() == true) - return false; - - OpTextProgress Progress(*_config); - pkgCacheGenerator Gen(Map,Progress); - if (_error->PendingError() == true) - return false; - - unsigned long Length = CmdL.FileSize() - 1; - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - Progress.OverallProgress(I - CmdL.FileList,Length,1,"Generating cache"); - Progress.SubProgress(Length); - - // Do the merge - FileFd TagF(*I,FileFd::ReadOnly); - debListParser Parser(TagF); - if (_error->PendingError() == true) - return _error->Error("Problem opening %s",*I); - - if (Gen.SelectFile(*I,"") == false) - return _error->Error("Problem with SelectFile"); - - if (Gen.MergeList(Parser) == false) - return _error->Error("Problem with MergeList"); - } - - Progress.Done(); - GCache = &Gen.GetCache(); - Stats(CmdL); - - return true; -#endif -} - /*}}}*/ -// DisplayRecord - Displays the complete record for the package /*{{{*/ -// --------------------------------------------------------------------- -/* This displays the package record from the proper package index file. - It is not used by DumpAvail for performance reasons. */ -bool DisplayRecord(pkgCache::VerIterator V) -{ - // Find an appropriate file - pkgCache::VerFileIterator Vf = V.FileList(); - for (; Vf.end() == false; Vf++) - if ((Vf.File()->Flags & pkgCache::Flag::NotSource) == 0) - break; - if (Vf.end() == true) - Vf = V.FileList(); - - // Check and load the package list file - pkgCache::PkgFileIterator I = Vf.File(); - if (I.IsOk() == false) - return _error->Error(_("Package file %s is out of sync."),I.FileName()); - - FileFd PkgF(I.FileName(),FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Read the record and then write it out again. - unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1]; - Buffer[V.FileList()->Size] = '\n'; - if (PkgF.Seek(V.FileList()->Offset) == false || - PkgF.Read(Buffer,V.FileList()->Size) == false || - fwrite(Buffer,1,V.FileList()->Size+1,stdout) < (size_t)(V.FileList()->Size+1)) - { - delete [] Buffer; - return false; - } - - delete [] Buffer; - - return true; -} - /*}}}*/ -// Search - Perform a search /*{{{*/ -// --------------------------------------------------------------------- -/* This searches the package names and pacakge descriptions for a pattern */ -struct ExVerFile -{ - pkgCache::VerFile *Vf; - bool NameMatch; -}; - -bool Search(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - bool ShowFull = _config->FindB("APT::Cache::ShowFull",false); - bool NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); - unsigned NumPatterns = CmdL.FileSize() -1; - - pkgDepCache::Policy Plcy; - - // Make sure there is at least one argument - if (NumPatterns < 1) - return _error->Error(_("You must give exactly one pattern")); - - // Compile the regex pattern - regex_t *Patterns = new regex_t[NumPatterns]; - memset(Patterns,0,sizeof(*Patterns)*NumPatterns); - for (unsigned I = 0; I != NumPatterns; I++) - { - if (regcomp(&Patterns[I],CmdL.FileList[I+1],REG_EXTENDED | REG_ICASE | - REG_NOSUB) != 0) - { - for (; I != 0; I--) - regfree(&Patterns[I]); - return _error->Error("Regex compilation error"); - } - } - - // Create the text record parser - pkgRecords Recs(Cache); - if (_error->PendingError() == true) - { - for (unsigned I = 0; I != NumPatterns; I++) - regfree(&Patterns[I]); - return false; - } - - ExVerFile *VFList = new ExVerFile[Cache.HeaderP->PackageCount+1]; - memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1); - - // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - VFList[P->ID].NameMatch = NumPatterns != 0; - for (unsigned I = 0; I != NumPatterns; I++) - { - if (regexec(&Patterns[I],P.Name(),0,0,0) == 0) - VFList[P->ID].NameMatch &= true; - else - VFList[P->ID].NameMatch = false; - } - - // Doing names only, drop any that dont match.. - if (NamesOnly == true && VFList[P->ID].NameMatch == false) - continue; - - // Find the proper version to use. - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); - if (V.end() == false) - VFList[P->ID].Vf = V.FileList(); - } - - // Include all the packages that provide matching names too - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - if (VFList[P->ID].NameMatch == false) - continue; - - for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) - { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); - if (V.end() == false) - { - VFList[Prv.OwnerPkg()->ID].Vf = V.FileList(); - VFList[Prv.OwnerPkg()->ID].NameMatch = true; - } - } - } - - LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList)); - - // Iterate over all the version records and check them - for (ExVerFile *J = VFList; J->Vf != 0; J++) - { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf)); - - bool Match = true; - if (J->NameMatch == false) - { - string LongDesc = P.LongDesc(); - Match = NumPatterns != 0; - for (unsigned I = 0; I != NumPatterns; I++) - { - if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) - Match &= true; - else - Match = false; - } - } - - if (Match == true) - { - if (ShowFull == true) - { - const char *Start; - const char *End; - P.GetRec(Start,End); - fwrite(Start,End-Start,1,stdout); - putc('\n',stdout); - } - else - printf("%s - %s\n",P.Name().c_str(),P.ShortDesc().c_str()); - } - } - - delete [] VFList; - for (unsigned I = 0; I != NumPatterns; I++) - regfree(&Patterns[I]); - if (ferror(stdout)) - return _error->Error("Write to stdout failed"); - return true; -} - /*}}}*/ -// ShowPackage - Dump the package record to the screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ShowPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - pkgDepCache::Policy Plcy; - - unsigned found = 0; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - - ++found; - - // Find the proper version to use. - if (_config->FindB("APT::Cache::AllVersions","true") == true) - { - pkgCache::VerIterator V; - for (V = Pkg.VersionList(); V.end() == false; V++) - { - if (DisplayRecord(V) == false) - return false; - } - } - else - { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); - if (V.end() == true || V.FileList().end() == true) - continue; - if (DisplayRecord(V) == false) - return false; - } - } - - if (found > 0) - return true; - return _error->Error(_("No packages found")); -} - /*}}}*/ -// ShowPkgNames - Show package names /*{{{*/ -// --------------------------------------------------------------------- -/* This does a prefix match on the first argument */ -bool ShowPkgNames(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - pkgCache::PkgIterator I = Cache.PkgBegin(); - bool All = _config->FindB("APT::Cache::AllNames","false"); - - if (CmdL.FileList[1] != 0) - { - for (;I.end() != true; I++) - { - if (All == false && I->VersionList == 0) - continue; - - if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0) - cout << I.Name() << endl; - } - - return true; - } - - // Show all pkgs - for (;I.end() != true; I++) - { - if (All == false && I->VersionList == 0) - continue; - cout << I.Name() << endl; - } - - return true; -} - /*}}}*/ -// ShowSrcPackage - Show source package records /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ShowSrcPackage(CommandLine &CmdL) -{ - pkgSourceList List; - List.ReadMainList(); - - // Create the text record parsers - pkgSrcRecords SrcRecs(List); - if (_error->PendingError() == true) - return false; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - SrcRecs.Restart(); - - pkgSrcRecords::Parser *Parse; - while ((Parse = SrcRecs.Find(*I,false)) != 0) - cout << Parse->AsStr() << endl;; - } - return true; -} - /*}}}*/ -// Policy - Show the results of the preferences file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Policy(CommandLine &CmdL) -{ - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - pkgCache &Cache = *GCache; - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) - return false; - - // Print out all of the package files - if (CmdL.FileList[1] == 0) - { - cout << _("Package files:") << endl; - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) - { - // Locate the associated index files so we can derive a description - pkgIndexFile *Indx; - if (SrcList->FindIndex(F,Indx) == false && - _system->FindIndex(F,Indx) == false) - return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(_("%4i %s\n"), - Plcy.GetPriority(F),Indx->Describe(true).c_str()); - - // Print the reference information for the package - string Str = F.RelStr(); - if (Str.empty() == false) - printf(" release %s\n",F.RelStr().c_str()); - if (F.Site() != 0 && F.Site()[0] != 0) - printf(" origin %s\n",F.Site()); - } - - // Show any packages have explicit pins - cout << _("Pinned packages:") << endl; - pkgCache::PkgIterator I = Cache.PkgBegin(); - for (;I.end() != true; I++) - { - if (Plcy.GetPriority(I) == 0) - continue; - - // Print the package name and the version we are forcing to - cout << " " << I.Name() << " -> "; - - pkgCache::VerIterator V = Plcy.GetMatch(I); - if (V.end() == true) - cout << _("(not found)") << endl; - else - cout << V.VerStr() << endl; - } - - return true; - } - - // Print out detailed information for each package - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - - cout << Pkg.Name() << ":" << endl; - - // Installed version - cout << _(" Installed: "); - if (Pkg->CurrentVer == 0) - cout << _("(none)") << endl; - else - cout << Pkg.CurrentVer().VerStr() << endl; - - // Candidate Version - cout << _(" Candidate: "); - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); - if (V.end() == true) - cout << _("(none)") << endl; - else - cout << V.VerStr() << endl; - - // Pinned version - if (Plcy.GetPriority(Pkg) != 0) - { - cout << _(" Package pin: "); - V = Plcy.GetMatch(Pkg); - if (V.end() == true) - cout << _("(not found)") << endl; - else - cout << V.VerStr() << endl; - } - - // Show the priority tables - cout << _(" Version table:") << endl; - for (V = Pkg.VersionList(); V.end() == false; V++) - { - if (Pkg.CurrentVer() == V) - cout << " *** " << V.VerStr(); - else - cout << " " << V.VerStr(); - cout << " " << Plcy.GetPriority(Pkg) << endl; - for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++) - { - // Locate the associated index files so we can derive a description - pkgIndexFile *Indx; - if (SrcList->FindIndex(VF.File(),Indx) == false && - _system->FindIndex(VF.File(),Indx) == false) - return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()), - Indx->Describe(true).c_str()); - } - } - } - - return true; -} - /*}}}*/ -// Madison - Look a bit like katie's madison /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Madison(CommandLine &CmdL) -{ - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - SrcList->ReadMainList(); - - pkgCache &Cache = *GCache; - - // Create the src text record parsers and ignore errors about missing - // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords - pkgSrcRecords SrcRecs(*SrcList); - if (_error->PendingError() == true) - _error->Discard(); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - - if (Pkg.end() == false) - { - for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; V++) - { - for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++) - { -// This might be nice, but wouldn't uniquely identify the source -mdz -// if (VF.File().Archive() != 0) -// { -// cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | " -// << VF.File().Archive() << endl; -// } - - // Locate the associated index files so we can derive a description - for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); S++) - { - vector *Indexes = (*S)->GetIndexFiles(); - for (vector::const_iterator IF = Indexes->begin(); - IF != Indexes->end(); IF++) - { - if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File()) - { - cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | " - << (*IF)->Describe(true) << endl; - } - } - } - } - } - } - - - SrcRecs.Restart(); - pkgSrcRecords::Parser *SrcParser; - while ((SrcParser = SrcRecs.Find(*I,false)) != 0) - { - // Maybe support Release info here too eventually - cout << setw(10) << SrcParser->Package() << " | " - << setw(10) << SrcParser->Version() << " | " - << SrcParser->Index().Describe(true) << endl; - } - } - - return true; -} - - /*}}}*/ -// GenCaches - Call the main cache generator /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool GenCaches(CommandLine &Cmd) -{ - OpTextProgress Progress(*_config); - - pkgSourceList List; - if (List.ReadMainList() == false) - return false; - return pkgMakeStatusCache(List,Progress); -} - /*}}}*/ -// ShowHelp - Show a help screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ShowHelp(CommandLine &Cmd) -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - - if (_config->FindB("version") == true) - return true; - - cout << - _("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"); - return true; -} - /*}}}*/ -// CacheInitialize - Initialize things for apt-cache /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void CacheInitialize() -{ - _config->Set("quiet",0); - _config->Set("help",false); -} - /*}}}*/ - -int main(int argc,const char *argv[]) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'p',"pkg-cache","Dir::Cache::pkgcache",CommandLine::HasArg}, - {'s',"src-cache","Dir::Cache::srcpkgcache",CommandLine::HasArg}, - {'q',"quiet","quiet",CommandLine::IntLevel}, - {'i',"important","APT::Cache::Important",0}, - {'f',"full","APT::Cache::ShowFull",0}, - {'g',"generate","APT::Cache::Generate",0}, - {'a',"all-versions","APT::Cache::AllVersions",0}, - {'n',"names-only","APT::Cache::NamesOnly",0}, - {0,"all-names","APT::Cache::AllNames",0}, - {0,"recurse","APT::Cache::RecurseDepends",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,"installed","APT::Cache::Installed",0}, - {0,0,0,0}}; - CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp}, - {"add",&DoAdd}, - {"gencaches",&GenCaches}, - {"showsrc",&ShowSrcPackage}, - {0,0}}; - CommandLine::Dispatch CmdsB[] = {{"showpkg",&DumpPackage}, - {"stats",&Stats}, - {"dump",&Dump}, - {"dumpavail",&DumpAvail}, - {"unmet",&UnMet}, - {"search",&Search}, - {"depends",&Depends}, - {"rdepends",&RDepends}, - {"dotty",&Dotty}, - {"xvcg",&XVcg}, - {"show",&ShowPackage}, - {"pkgnames",&ShowPkgNames}, - {"policy",&Policy}, - {"madison",&Madison}, - {0,0}}; - - CacheInitialize(); - - // Set up gettext support - setlocale(LC_ALL,""); - //textdomain(PACKAGE); - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - CmdL.FileSize() == 0) - { - ShowHelp(CmdL); - return 0; - } - - // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) - _config->Set("quiet","1"); - - if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false) - { - MMap *Map = 0; - if (_config->FindB("APT::Cache::Generate",true) == false) - { - Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), - FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); - } - else - { - // Open the cache file - SrcList = new pkgSourceList; - SrcList->ReadMainList(); - - // Generate it and map it - OpProgress Prog; - pkgMakeStatusCache(*SrcList,Prog,&Map,true); - } - - if (_error->PendingError() == false) - { - pkgCache Cache(Map); - GCache = &Cache; - if (_error->PendingError() == false) - CmdL.DispatchArg(CmdsB); - } - delete Map; - } - - // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; -} diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 67c27d5..8e49234 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $ @@ -139,8 +135,8 @@ bool DoIdent(CommandLine &) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; @@ -171,15 +167,6 @@ int ShowHelp() int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/cmdline/apt-cdrom.cc.orig b/cmdline/apt-cdrom.cc.orig deleted file mode 100644 index 677df81..0000000 --- a/cmdline/apt-cdrom.cc.orig +++ /dev/null @@ -1,237 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $ -/* ###################################################################### - - APT CDROM - Tool for handling APT's CDROM database. - - Currently the only option is 'add' which will take the current CD - in the drive and add it into the database. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//#include "indexcopy.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - /*}}}*/ - -using namespace std; - - /*{{{*/ -class pkgCdromTextStatus : public pkgCdromStatus -{ -protected: - OpTextProgress Progress; - void Prompt(const char *Text); - string PromptLine(const char *Text); - bool AskCdromName(string &name); - -public: - virtual void Update(string text, int current); - virtual bool ChangeCdrom(); - virtual OpProgress* GetOpProgress(); -}; - -void pkgCdromTextStatus::Prompt(const char *Text) -{ - char C; - cout << Text << ' ' << flush; - read(STDIN_FILENO,&C,1); - if (C != '\n') - cout << endl; -} - -string pkgCdromTextStatus::PromptLine(const char *Text) -{ - cout << Text << ':' << endl; - - string Res; - getline(cin,Res); - return Res; -} - -bool pkgCdromTextStatus::AskCdromName(string &name) -{ - cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush; - name = PromptLine(""); - - return true; -} - - -void pkgCdromTextStatus::Update(string text, int current) -{ - if(text.size() > 0) - cout << text << flush; -} - -bool pkgCdromTextStatus::ChangeCdrom() -{ - Prompt(_("Please insert a Disc in the drive and press enter")); - return true; -} - -OpProgress* pkgCdromTextStatus::GetOpProgress() -{ - return &Progress; -}; - - /*}}}*/ - -// DoAdd - Add a new CDROM /*{{{*/ -// --------------------------------------------------------------------- -/* This does the main add bit.. We show some status and things. The - sequence is to mount/umount the CD, Ident it then scan it for package - files and reduce that list. Then we copy over the package files and - verify them. Then rewrite the database files */ -bool DoAdd(CommandLine &) -{ - bool res = false; - pkgCdromTextStatus log; - pkgCdrom cdrom; - res = cdrom.Add(&log); - if(res) - cout << _("Repeat this process for the rest of the CDs in your set.") << endl; - return res; -} - /*}}}*/ -// DoIdent - Ident a CDROM /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DoIdent(CommandLine &) -{ - string ident; - pkgCdromTextStatus log; - pkgCdrom cdrom; - return cdrom.Ident(ident, &log); -} - /*}}}*/ - -// ShowHelp - Show the help screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int ShowHelp() -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - if (_config->FindB("version") == true) - return 0; - - cout << - "Usage: apt-cdrom [options] command\n" - "\n" - "apt-cdrom is a tool to add CDROM's to APT's source list. The\n" - "CDROM mount point and device information is taken from apt.conf\n" - "and /etc/fstab.\n" - "\n" - "Commands:\n" - " add - Add a CDROM\n" - " ident - Report the identity of a CDROM\n" - "\n" - "Options:\n" - " -h This help text\n" - " -d CD-ROM mount point\n" - " -r Rename a recognized CD-ROM\n" - " -m No mounting\n" - " -f Fast mode, don't check package files\n" - " -a Thorough scan mode\n" - " -c=? Read this configuration file\n" - " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" - "See fstab(5)\n"; - return 0; -} - /*}}}*/ - -int main(int argc,const char *argv[]) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg}, - {'r',"rename","APT::CDROM::Rename",0}, - {'m',"no-mount","APT::CDROM::NoMount",0}, - {'f',"fast","APT::CDROM::Fast",0}, - {'n',"just-print","APT::CDROM::NoAct",0}, - {'n',"recon","APT::CDROM::NoAct",0}, - {'n',"no-act","APT::CDROM::NoAct",0}, - {'a',"thorough","APT::CDROM::Thorough",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - CommandLine::Dispatch Cmds[] = { - {"add",&DoAdd}, - {"ident",&DoIdent}, - {0,0}}; - - // Set up gettext support - setlocale(LC_ALL,""); - //textdomain(PACKAGE); - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || _config->FindB("version") == true || - CmdL.FileSize() == 0) - return ShowHelp(); - - // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) - _config->Set("quiet","1"); - - // Match the operation - CmdL.DispatchArg(Cmds); - - // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; -} diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 2a23108..9ac5c4c 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $ @@ -71,8 +67,8 @@ bool DoDump(CommandLine &CmdL) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; @@ -95,15 +91,6 @@ int ShowHelp() int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/cmdline/apt-config.cc.orig b/cmdline/apt-config.cc.orig deleted file mode 100644 index f154cd8..0000000 --- a/cmdline/apt-config.cc.orig +++ /dev/null @@ -1,148 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $ -/* ###################################################################### - - APT Config - Program to manipulate APT configuration files - - This program will parse a config file and then do something with it. - - Commands: - shell - Shell mode. After this a series of word pairs should occure. - The first is the environment var to set and the second is - the key to set it from. Use like: - eval `apt-config shell QMode apt::QMode` - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - /*}}}*/ -using namespace std; - -// DoShell - Handle the shell command /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DoShell(CommandLine &CmdL) -{ - for (const char **I = CmdL.FileList + 1; *I != 0; I += 2) - { - if (I[1] == 0 || strlen(I[1]) == 0) - return _error->Error(_("Arguments not in pairs")); - - string key = I[1]; - if (key.end()[-1] == '/') // old directory format - key.append("d"); - - if (_config->ExistsAny(key.c_str())) - cout << *I << "='" << - SubstVar(_config->FindAny(key.c_str()),"'","'\\''") << '\'' << endl; - - } - - return true; -} - /*}}}*/ -// DoDump - Dump the configuration space /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DoDump(CommandLine &CmdL) -{ - _config->Dump(cout); - return true; -} - /*}}}*/ -// ShowHelp - Show the help screen /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int ShowHelp() -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - if (_config->FindB("version") == true) - return 0; - - cout << - _("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"); - return 0; -} - /*}}}*/ - -int main(int argc,const char *argv[]) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - CommandLine::Dispatch Cmds[] = {{"shell",&DoShell}, - {"dump",&DoDump}, - {0,0}}; - - // Set up gettext support - setlocale(LC_ALL,""); - //textdomain(PACKAGE); - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - CmdL.FileSize() == 0) - return ShowHelp(); - - // Match the operation - CmdL.DispatchArg(Cmds); - - // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; -} diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index dca5f89..1e6509d 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $ @@ -226,8 +222,8 @@ bool DebFile::ParseInfo() /* */ int ShowHelp(void) { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; @@ -253,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - char *tempdir = NULL; + const char *tempdir = NULL; tempdir = getenv("TMPDIR"); if (tempdir == NULL) @@ -355,15 +351,6 @@ bool Go(CommandLine &CmdL) int main(int argc, const char **argv) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/cmdline/apt-extracttemplates.cc.orig b/cmdline/apt-extracttemplates.cc.orig deleted file mode 100644 index b1dbd95..0000000 --- a/cmdline/apt-extracttemplates.cc.orig +++ /dev/null @@ -1,406 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $ -/* ###################################################################### - - APT Extract Templates - Program to extract debconf config and template - files - - This is a simple program to extract config and template information - from Debian packages. It can be used to speed up the preconfiguration - process for debconf-enabled packages - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include "apt-extracttemplates.h" - /*}}}*/ - -using namespace std; - -#define TMPDIR "/tmp" - -pkgCache *DebFile::Cache = 0; - -// DebFile::DebFile - Construct the DebFile object /*{{{*/ -// --------------------------------------------------------------------- -/* */ -DebFile::DebFile(const char *debfile) - : File(debfile, FileFd::ReadOnly), Control(0), DepOp(0), - PreDepOp(0), Config(0), Template(0), Which(None) -{ -} - /*}}}*/ -// DebFile::~DebFile - Destruct the DebFile object /*{{{*/ -// --------------------------------------------------------------------- -/* */ -DebFile::~DebFile() -{ - delete [] Control; - delete [] Config; - delete [] Template; -} - /*}}}*/ -// DebFile::GetInstalledVer - Find out the installed version of a pkg /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string DebFile::GetInstalledVer(const string &package) -{ - pkgCache::PkgIterator Pkg = Cache->FindPkg(package); - if (Pkg.end() == false) - { - pkgCache::VerIterator V = Pkg.CurrentVer(); - if (V.end() == false) - { - return V.VerStr(); - } - } - - return string(); -} - /*}}}*/ -// DebFile::Go - Start extracting a debian package /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DebFile::Go() -{ - ARArchive AR(File); - if (_error->PendingError() == true) - return false; - - const ARArchive::Member *Member = AR.FindMember("control.tar.gz"); - if (Member == 0) - return _error->Error(_("%s not a valid DEB package."),File.Name().c_str()); - - if (File.Seek(Member->Start) == false) - return false; - ExtractTar Tar(File, Member->Size,"gzip"); - return Tar.Go(*this); -} - /*}}}*/ -// DebFile::DoItem examine element in package and mark /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DebFile::DoItem(Item &I, int &Fd) -{ - if (strcmp(I.Name, "control") == 0) - { - delete [] Control; - Control = new char[I.Size+1]; - Control[I.Size] = 0; - Which = IsControl; - ControlLen = I.Size; - // make it call the Process method below. this is so evil - Fd = -2; - } - else if (strcmp(I.Name, "config") == 0) - { - delete [] Config; - Config = new char[I.Size+1]; - Config[I.Size] = 0; - Which = IsConfig; - Fd = -2; - } - else if (strcmp(I.Name, "templates") == 0) - { - delete [] Template; - Template = new char[I.Size+1]; - Template[I.Size] = 0; - Which = IsTemplate; - Fd = -2; - } - else - { - // Ignore it - Fd = -1; - } - return true; -} - /*}}}*/ -// DebFile::Process examine element in package and copy /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DebFile::Process(Item &I, const unsigned char *data, - unsigned long size, unsigned long pos) -{ - switch (Which) - { - case IsControl: - memcpy(Control + pos, data, size); - break; - case IsConfig: - memcpy(Config + pos, data, size); - break; - case IsTemplate: - memcpy(Template + pos, data, size); - break; - default: /* throw it away */ ; - } - return true; -} - /*}}}*/ -// DebFile::ParseInfo - Parse control file for dependency info /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DebFile::ParseInfo() -{ - if (Control == NULL) return false; - - pkgTagSection Section; - Section.Scan(Control, ControlLen); - - Package = Section.FindS("Package"); - Version = GetInstalledVer(Package); - - const char *Start, *Stop; - if (Section.Find("Depends", Start, Stop) == true) - { - while (1) - { - string P, V; - unsigned int Op; - Start = debListParser::ParseDepends(Start, Stop, P, V, Op); - if (Start == 0) return false; - if (P == "debconf") - { - DepVer = V; - DepOp = Op; - break; - } - if (Start == Stop) break; - } - } - - if (Section.Find("Pre-Depends", Start, Stop) == true) - { - while (1) - { - string P, V; - unsigned int Op; - Start = debListParser::ParseDepends(Start, Stop, P, V, Op); - if (Start == 0) return false; - if (P == "debconf") - { - PreDepVer = V; - PreDepOp = Op; - break; - } - if (Start == Stop) break; - } - } - - return true; -} - /*}}}*/ -// ShowHelp - show a short help text /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int ShowHelp(void) -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - - if (_config->FindB("version") == true) - return 0; - - cout << - _("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"); - return 0; -} - /*}}}*/ -// WriteFile - write the contents of the passed string to a file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -string WriteFile(const char *package, const char *prefix, const char *data) -{ - char fn[512]; - static int i; - char *tempdir = NULL; - - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = TMPDIR; - - snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", - _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(), - package, prefix, getpid(), i++); - FileFd f; - if (data == NULL) - data = ""; - - if (!f.Open(fn, FileFd::WriteTemp, 0600)) - { - _error->Errno("ofstream::ofstream",_("Unable to write to %s"),fn); - return string(); - } - - f.Write(data, strlen(data)); - f.Close(); - return fn; -} - /*}}}*/ -// WriteConfig - write out the config data from a debian package file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void WriteConfig(const DebFile &file) -{ - string templatefile = WriteFile(file.Package.c_str(), "template", file.Template); - string configscript = WriteFile(file.Package.c_str(), "config", file.Config); - - if (templatefile.empty() == true || configscript.empty() == true) - return; - cout << file.Package << " " << file.Version << " " - << templatefile << " " << configscript << endl; -} - /*}}}*/ -// InitCache - initialize the package cache /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Go(CommandLine &CmdL) -{ - // Initialize the apt cache - MMap *Map = 0; - pkgSourceList List; - List.ReadMainList(); - OpProgress Prog; - pkgMakeStatusCache(List,Prog,&Map,true); - if (Map == 0) - return false; - DebFile::Cache = new pkgCache(Map); - if (_error->PendingError() == true) - return false; - - // Find out what version of debconf is currently installed - string debconfver = DebFile::GetInstalledVer("debconf"); - if (debconfver.empty() == true) - return _error->Error( _("Cannot get debconf version. Is debconf installed?")); - - // Process each package passsed in - for (unsigned int I = 0; I != CmdL.FileSize(); I++) - { - // Will pick up the errors later.. - DebFile file(CmdL.FileList[I]); - if (file.Go() == false) - { - _error->Error("Prior errors apply to %s",CmdL.FileList[I]); - continue; - } - - // Does the package have templates? - if (file.Template != 0 && file.ParseInfo() == true) - { - // Check to make sure debconf dependencies are - // satisfied - // cout << "Check " << file.DepVer << ',' << debconfver << endl; - if (file.DepVer != "" && - DebFile::Cache->VS->CheckDep(debconfver.c_str(), - file.DepOp,file.DepVer.c_str() - ) == false) - continue; - if (file.PreDepVer != "" && - DebFile::Cache->VS->CheckDep(debconfver.c_str(), - file.PreDepOp,file.PreDepVer.c_str() - ) == false) - continue; - - WriteConfig(file); - } - } - - - delete Map; - delete DebFile::Cache; - - return !_error->PendingError(); -} - /*}}}*/ - -int main(int argc, const char **argv) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'t',"tempdir","APT::ExtractTemplates::TempDir",CommandLine::HasArg}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - - // Set up gettext support - setlocale(LC_ALL,""); - //textdomain(PACKAGE); - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - CmdL.FileSize() == 0) - return ShowHelp(); - - Go(CmdL); - - // Print any errors or warnings found during operation - if (_error->empty() == false) - { - // This goes to stderr.. - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; -} diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5c93e52..3ddaf7d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $ @@ -57,6 +53,8 @@ extern "C" { #include #include #include +#include +#include #include #include #include @@ -64,8 +62,11 @@ extern "C" { #include #include #include +#include /*}}}*/ +#define RAMFS_MAGIC 0x858458f6 + #define _trace() printf("_trace(%s:%d)\n", __FILE__, __LINE__) using namespace std; @@ -633,6 +634,8 @@ void CacheFile::Sort() and verifies that the system is OK. */ bool CacheFile::CheckDeps(bool AllowBroken) { + bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false); + if (_error->PendingError() == true) return false; @@ -644,12 +647,24 @@ bool CacheFile::CheckDeps(bool AllowBroken) if (pkgApplyStatus(*DCache) == false) return false; + if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true) + { + FixBroken = true; + if ((DCache->PolicyBrokenCount() > 0)) + { + // upgrade all policy-broken packages with ForceImportantDeps=True + for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++) + if ((*DCache)[I].NowPolicyBroken() == true) + DCache->MarkInstall(I,true,0, false, true); + } + } + // Nothing is broken if (DCache->BrokenCount() == 0 || AllowBroken == true) return true; // Attempt to fix broken things - if (_config->FindB("APT::Get::Fix-Broken",false) == true) + if (FixBroken == true) { c1out << _("Correcting dependencies...") << flush; if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0) @@ -825,16 +840,16 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != FetchBytes) ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"), SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str()); - else + else if (DebBytes != 0) ioprintf(c1out,_("Need to get %sB of archives.\n"), SizeToStr(DebBytes).c_str()); // Size delta if (Cache->UsrSize() >= 0) - ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"), + ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"), SizeToStr(Cache->UsrSize()).c_str()); else - ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"), + ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"), SizeToStr(-1*Cache->UsrSize()).c_str()); if (_error->PendingError() == true) @@ -851,8 +866,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s."), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s."), + OutputDir.c_str()); + } } // Fail safe check @@ -908,7 +928,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } @@ -1000,7 +1020,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, cerr << _("Unable to correct missing packages.") << endl; return _error->Error(_("Aborting install.")); } - + _system->UnLock(); int status_fd = _config->FindI("APT::Status-Fd",-1); pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); @@ -1150,9 +1170,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, else ExpectedInst++; - // Install it with autoinstalling enabled. - if (State.InstBroken() == true && BrokenFix == false) + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); + return true; } /*}}}*/ @@ -1331,14 +1353,15 @@ bool DoUpdate(CommandLine &CmdL) return _error->Error(_("Unable to lock the list directory")); } - // Create the download object + // Create the progress AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); - - + // Just print out the uris an exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) { + // get a fetcher + pkgAcquire Fetcher(&Stat); + // Populate it with the source selection and get all Indexes // (GetAll=true) if (List.GetIndexes(&Fetcher,true) == false) @@ -1347,50 +1370,89 @@ bool DoUpdate(CommandLine &CmdL) pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } - // Populate it with the source selection - if (List.GetIndexes(&Fetcher) == false) - return false; - - // Run it - if (Fetcher.Run() == pkgAcquire::Failed) + // do the work + CacheFile Cache; + if (_config->FindB("APT::Get::Download",true) == true) + ListUpdate(Stat, List); + + // Rebuild the cache. + if (Cache.BuildCaches() == false) return false; + + return true; +} + /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); + bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); + pkgDepCache::ActionGroup group(*Cache); - bool Failed = false; - for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + if(Debug) + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false && + doAutoRemove == true) { - if ((*I)->Status == pkgAcquire::Item::StatDone) - continue; + c1out << _("We are not supposed to delete stuff, can't start " + "AutoRemover") << std::endl; + doAutoRemove = false; + } - (*I)->Finished(); - - fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), - (*I)->ErrorText.c_str()); - Failed = true; + string autoremovelist, autoremoveversions; + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + if(Debug) + std::cout << "We could delete %s" << Pkg.Name() << std::endl; + + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } + if (doAutoRemove) + { + if(Pkg.CurrentVer() != 0 && + Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } } - - // Clean out any old list files - if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true) + if (!hideAutoRemove) + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0) + c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) { - if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || - Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) - return false; + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); } - - // Prepare the cache. - CacheFile Cache; - if (Cache.BuildCaches() == false) - return false; - - if (Failed == true) - return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); - return true; } - /*}}}*/ + // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@ -1411,6 +1473,61 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// DoInstallTask - Install task from the command line /*{{{*/ +// --------------------------------------------------------------------- +/* Install named task */ +bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, + bool BrokenFix, + unsigned int& ExpectedInst, + const char *taskname, + bool Remove) +{ + const char *start, *end; + pkgCache::PkgIterator Pkg; + char buf[64*1024]; + regex_t Pattern; + + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) + return _error->Error("Failed to compile task regexp"); + + bool found = false; + bool res = true; + + // two runs, first ignore dependencies, second install any missing + for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) + { + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); + found = true; + } + } + + // now let the problem resolver deal with any issues + Fix.Resolve(true); + + if(!found) + _error->Error(_("Couldn't find task %s"),taskname); + + regfree(&Pattern); + return res; +} + // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1426,6 +1543,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; + unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; unsigned int Packages = 0; pkgProblemResolver Fix(Cache); @@ -1433,155 +1551,198 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; - while (Cache->FindPkg(S).end() == true) + _config->Set("APT::Get::Purge", true); + DefRemove = true; + } + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } + // new scope for the ActionGroup + { + pkgDepCache::ActionGroup group(Cache); + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; + // Duplicate the string + unsigned int Length = strlen(*I); + char S[300]; + if (Length >= sizeof(S)) continue; - } - - if (Length >= 1 && S[Length - 1] == '+') + strcpy(S,*I); + + // See if we are removing and special indicators.. + bool Remove = DefRemove; + char *VerTag = 0; + bool VerIsRel = false; + + // this is a task! + if (Length >= 1 && S[Length - 1] == '^') + { + S[--Length] = 0; + // tasks must always be confirmed + ExpectedInst += 1000; + // see if we can install it + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); + continue; + } + + while (Cache->FindPkg(S).end() == true) { - Remove = false; - S[--Length] = 0; - continue; - } + // Handle an optional end tag indicating what to do + if (Length >= 1 && S[Length - 1] == '-') + { + Remove = true; + S[--Length] = 0; + continue; + } - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } + if (Length >= 1 && S[Length - 1] == '+') + { + Remove = false; + S[--Length] = 0; + continue; + } - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } + char *Slash = strchr(S,'='); + if (Slash != 0) + { + VerIsRel = false; + *Slash = 0; + VerTag = Slash + 1; + } - break; - } + Slash = strchr(S,'/'); + if (Slash != 0) + { + VerIsRel = true; + *Slash = 0; + VerTag = Slash + 1; + } + + break; + } - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) - return _error->Error(_("Couldn't find package %s"),S); + // Locate the package + pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + Packages++; + if (Pkg.end() == true) + { + // Check if the name is a regex + const char *I; + for (I = S; *I != 0; I++) + if (*I == '?' || *I == '*' || *I == '|' || + *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return _error->Error(_("Couldn't find package %s"),S); - // Regexs must always be confirmed - ExpectedInst += 1000; + // Regexs must always be confirmed + ExpectedInst += 1000; - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); - } + // Compile the regex pattern + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | + REG_NOSUB)) != 0) + { + char Error[300]; + regerror(Res,&Pattern,Error,sizeof(Error)); + return _error->Error(_("Regex compilation error - %s"),Error); + } - // Run over the matches - bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) - continue; + // Run over the matches + bool Hit = false; + for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + { + if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + continue; - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), + Pkg.Name(),S); + if (VerTag != 0) + if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + return false; + + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, + ExpectedInst,false); + } + regfree(&Pattern); + + if (Hit == false) + return _error->Error(_("Couldn't find package %s"),S); + } + else + { if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } - regfree(&Pattern); - - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - } - } - /* If we are in the Broken fixing mode we do not attempt to fix the - problems. This is if the user invoked install without -f and gave - packages */ - if (BrokenFix == true && Cache->BrokenCount() != 0) - { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; - ShowBroken(c1out,Cache,false); + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if(!Remove && + Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.Name()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } + } - return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); - } + /* If we are in the Broken fixing mode we do not attempt to fix the + problems. This is if the user invoked install without -f and gave + packages */ + if (BrokenFix == true && Cache->BrokenCount() != 0) + { + c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); + } - // Call the scored problem resolver - Fix.InstallProtect(); - if (Fix.Resolve(true) == false) - _error->Discard(); + // Call the scored problem resolver + Fix.InstallProtect(); + if (Fix.Resolve(true) == false) + _error->Discard(); - // Now we check the state of the packages, - if (Cache->BrokenCount() != 0) - { - c1out << - _("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.") << endl; - if (Packages == 1) + // Now we check the state of the packages, + if (Cache->BrokenCount() != 0) { - 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; - } + _("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.") << endl; + /* + 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; + } + */ + + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + return _error->Error(_("Broken packages")); + } + } + if (!DoAutomaticRemove(Cache)) + return false; - c1out << _("The following information may help to resolve the situation:") << endl; - c1out << endl; - ShowBroken(c1out,Cache,false); - return _error->Error(_("Broken packages")); - } - /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@ -1601,8 +1762,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); @@ -1699,6 +1860,14 @@ bool DoInstall(CommandLine &CmdL) } + // if nothing changed in the cache, but only the automark information + // we write the StateFile here, otherwise it will be written in + // cache.commit() + if (AutoMarkChanged > 0 && + Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + Cache->writeStateFile(NULL); + // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); @@ -1737,6 +1906,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) return false; + pkgDepCache::ActionGroup group(Cache); + // Install everything with the install flag set pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) @@ -1955,6 +2126,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + continue; + // don't download the same uri twice (should this be moved to // the fetcher interface itself?) if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) @@ -1994,8 +2170,13 @@ bool DoSource(CommandLine &CmdL) return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s"), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s"), + OutputDir.c_str()); + } // Number of bytes if (DebBytes != FetchBytes) @@ -2018,7 +2199,7 @@ bool DoSource(CommandLine &CmdL) pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } @@ -2278,6 +2459,7 @@ bool DoBuildDep(CommandLine &CmdL) break; } if (CV.end() == true) + { if (hasAlternatives) { continue; @@ -2290,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL) Last->BuildDepType((*D).Type),Src.c_str(), (*D).Package.c_str()); } + } } else { @@ -2334,6 +2517,8 @@ bool DoBuildDep(CommandLine &CmdL) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) + Cache->MarkAuto(Pkg, true); continue; } else if (hasAlternatives) @@ -2389,8 +2574,8 @@ bool DoMoo(CommandLine &CmdL) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) { @@ -2448,6 +2633,8 @@ bool ShowHelp(CommandLine &CmdL) " 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" @@ -2463,7 +2650,7 @@ bool ShowHelp(CommandLine &CmdL) " -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 continue if the integrity check fails\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" @@ -2489,6 +2676,7 @@ void GetInitialize() _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@ -2508,15 +2696,6 @@ void SigWinch(int) int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, @@ -2545,7 +2724,8 @@ int main(int argc,const char *argv[]) {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, - {0,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, @@ -2553,7 +2733,10 @@ int main(int argc,const char *argv[]) {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, + {0,"auto-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, + {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, + {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; @@ -2561,6 +2744,9 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"purge",&DoInstall}, + {"autoremove",&DoInstall}, + {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, diff --git a/cmdline/apt-get.cc.orig b/cmdline/apt-get.cc.orig index 04791b5..f7e6f8b 100644 --- a/cmdline/apt-get.cc.orig +++ b/cmdline/apt-get.cc.orig @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $ @@ -57,6 +53,8 @@ extern "C" { #include #include #include +#include +#include #include #include #include @@ -64,8 +62,11 @@ extern "C" { #include #include #include +#include /*}}}*/ +#define RAMFS_MAGIC 0x858458f6 + #define _trace() printf("_trace(%s:%d)\n", __FILE__, __LINE__) using namespace std; @@ -633,6 +634,8 @@ void CacheFile::Sort() and verifies that the system is OK. */ bool CacheFile::CheckDeps(bool AllowBroken) { + bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false); + if (_error->PendingError() == true) return false; @@ -644,12 +647,24 @@ bool CacheFile::CheckDeps(bool AllowBroken) if (pkgApplyStatus(*DCache) == false) return false; + if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true) + { + FixBroken = true; + if ((DCache->PolicyBrokenCount() > 0)) + { + // upgrade all policy-broken packages with ForceImportantDeps=True + for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++) + if ((*DCache)[I].NowPolicyBroken() == true) + DCache->MarkInstall(I,true,0, false, true); + } + } + // Nothing is broken if (DCache->BrokenCount() == 0 || AllowBroken == true) return true; // Attempt to fix broken things - if (_config->FindB("APT::Get::Fix-Broken",false) == true) + if (FixBroken == true) { c1out << _("Correcting dependencies...") << flush; if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0) @@ -825,16 +840,16 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != FetchBytes) ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"), SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str()); - else + else if (DebBytes != 0) ioprintf(c1out,_("Need to get %sB of archives.\n"), SizeToStr(DebBytes).c_str()); // Size delta if (Cache->UsrSize() >= 0) - ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"), + ioprintf(c1out,_("After this operation, %sB of additional disk space will be used.\n"), SizeToStr(Cache->UsrSize()).c_str()); else - ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"), + ioprintf(c1out,_("After this operation, %sB disk space will be freed.\n"), SizeToStr(-1*Cache->UsrSize()).c_str()); if (_error->PendingError() == true) @@ -851,8 +866,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s."), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s."), + OutputDir.c_str()); + } } // Fail safe check @@ -908,7 +928,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } @@ -1000,7 +1020,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, cerr << _("Unable to correct missing packages.") << endl; return _error->Error(_("Aborting install.")); } - + _system->UnLock(); int status_fd = _config->FindI("APT::Status-Fd",-1); pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); @@ -1150,9 +1170,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, else ExpectedInst++; - // Install it with autoinstalling enabled. - if (State.InstBroken() == true && BrokenFix == false) + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); + return true; } /*}}}*/ @@ -1331,14 +1353,15 @@ bool DoUpdate(CommandLine &CmdL) return _error->Error(_("Unable to lock the list directory")); } - // Create the download object + // Create the progress AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); - - + // Just print out the uris an exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) { + // get a fetcher + pkgAcquire Fetcher(&Stat); + // Populate it with the source selection and get all Indexes // (GetAll=true) if (List.GetIndexes(&Fetcher,true) == false) @@ -1347,50 +1370,89 @@ bool DoUpdate(CommandLine &CmdL) pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } - // Populate it with the source selection - if (List.GetIndexes(&Fetcher) == false) - return false; - - // Run it - if (Fetcher.Run() == pkgAcquire::Failed) + // do the work + CacheFile Cache; + if (_config->FindB("APT::Get::Download",true) == true) + ListUpdate(Stat, List); + + // Rebuild the cache. + if (Cache.BuildCaches() == false) return false; + + return true; +} + /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); + bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); + pkgDepCache::ActionGroup group(*Cache); - bool Failed = false; - for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + if(Debug) + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false && + doAutoRemove == true) { - if ((*I)->Status == pkgAcquire::Item::StatDone) - continue; + c1out << _("We are not supposed to delete stuff, can't start " + "AutoRemover") << std::endl; + doAutoRemove = false; + } - (*I)->Finished(); - - fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), - (*I)->ErrorText.c_str()); - Failed = true; + string autoremovelist, autoremoveversions; + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + if(Debug) + std::cout << "We could delete %s" << Pkg.Name() << std::endl; + + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } + if (doAutoRemove) + { + if(Pkg.CurrentVer() != 0 && + Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } } - - // Clean out any old list files - if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true) + if (!hideAutoRemove) + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0) + c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; + + // Now see if we destroyed anything + if (Cache->BrokenCount() != 0) { - if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || - Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) - return false; + c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" + "shouldn't happen. Please file a bug report against apt.") << endl; + c1out << endl; + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Internal Error, AutoRemover broke stuff")); } - - // Prepare the cache. - CacheFile Cache; - if (Cache.BuildCaches() == false) - return false; - - if (Failed == true) - return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); - return true; } - /*}}}*/ + // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@ -1411,6 +1473,61 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// DoInstallTask - Install task from the command line /*{{{*/ +// --------------------------------------------------------------------- +/* Install named task */ +bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, + bool BrokenFix, + unsigned int& ExpectedInst, + const char *taskname, + bool Remove) +{ + const char *start, *end; + pkgCache::PkgIterator Pkg; + char buf[64*1024]; + regex_t Pattern; + + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) + return _error->Error("Failed to compile task regexp"); + + bool found = false; + bool res = true; + + // two runs, first ignore dependencies, second install any missing + for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) + { + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); + found = true; + } + } + + // now let the problem resolver deal with any issues + Fix.Resolve(true); + + if(!found) + _error->Error(_("Couldn't find task %s"),taskname); + + regfree(&Pattern); + return res; +} + // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1426,6 +1543,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; + unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; unsigned int Packages = 0; pkgProblemResolver Fix(Cache); @@ -1433,155 +1551,198 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; - while (Cache->FindPkg(S).end() == true) + _config->Set("APT::Get::Purge", true); + DefRemove = true; + } + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } + // new scope for the ActionGroup + { + pkgDepCache::ActionGroup group(Cache); + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; + // Duplicate the string + unsigned int Length = strlen(*I); + char S[300]; + if (Length >= sizeof(S)) continue; - } - - if (Length >= 1 && S[Length - 1] == '+') + strcpy(S,*I); + + // See if we are removing and special indicators.. + bool Remove = DefRemove; + char *VerTag = 0; + bool VerIsRel = false; + + // this is a task! + if (Length >= 1 && S[Length - 1] == '^') + { + S[--Length] = 0; + // tasks must always be confirmed + ExpectedInst += 1000; + // see if we can install it + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); + continue; + } + + while (Cache->FindPkg(S).end() == true) { - Remove = false; - S[--Length] = 0; - continue; - } + // Handle an optional end tag indicating what to do + if (Length >= 1 && S[Length - 1] == '-') + { + Remove = true; + S[--Length] = 0; + continue; + } - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } + if (Length >= 1 && S[Length - 1] == '+') + { + Remove = false; + S[--Length] = 0; + continue; + } - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } + char *Slash = strchr(S,'='); + if (Slash != 0) + { + VerIsRel = false; + *Slash = 0; + VerTag = Slash + 1; + } - break; - } + Slash = strchr(S,'/'); + if (Slash != 0) + { + VerIsRel = true; + *Slash = 0; + VerTag = Slash + 1; + } + + break; + } - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) - return _error->Error(_("Couldn't find package %s"),S); + // Locate the package + pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + Packages++; + if (Pkg.end() == true) + { + // Check if the name is a regex + const char *I; + for (I = S; *I != 0; I++) + if (*I == '?' || *I == '*' || *I == '|' || + *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return _error->Error(_("Couldn't find package %s"),S); - // Regexs must always be confirmed - ExpectedInst += 1000; + // Regexs must always be confirmed + ExpectedInst += 1000; - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); - } + // Compile the regex pattern + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | + REG_NOSUB)) != 0) + { + char Error[300]; + regerror(Res,&Pattern,Error,sizeof(Error)); + return _error->Error(_("Regex compilation error - %s"),Error); + } - // Run over the matches - bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) - continue; + // Run over the matches + bool Hit = false; + for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + { + if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + continue; - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), + Pkg.Name(),S); + if (VerTag != 0) + if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + return false; + + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, + ExpectedInst,false); + } + regfree(&Pattern); + + if (Hit == false) + return _error->Error(_("Couldn't find package %s"),S); + } + else + { if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } - regfree(&Pattern); - - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - } - } - /* If we are in the Broken fixing mode we do not attempt to fix the - problems. This is if the user invoked install without -f and gave - packages */ - if (BrokenFix == true && Cache->BrokenCount() != 0) - { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; - ShowBroken(c1out,Cache,false); + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if(!Remove && + Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.Name()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } + } - return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); - } + /* If we are in the Broken fixing mode we do not attempt to fix the + problems. This is if the user invoked install without -f and gave + packages */ + if (BrokenFix == true && Cache->BrokenCount() != 0) + { + c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); + } - // Call the scored problem resolver - Fix.InstallProtect(); - if (Fix.Resolve(true) == false) - _error->Discard(); + // Call the scored problem resolver + Fix.InstallProtect(); + if (Fix.Resolve(true) == false) + _error->Discard(); - // Now we check the state of the packages, - if (Cache->BrokenCount() != 0) - { - c1out << - _("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.") << endl; - if (Packages == 1) + // Now we check the state of the packages, + if (Cache->BrokenCount() != 0) { - 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; - } + _("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.") << endl; + /* + 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; + } + */ + + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + return _error->Error(_("Broken packages")); + } + } + if (!DoAutomaticRemove(Cache)) + return false; - c1out << _("The following information may help to resolve the situation:") << endl; - c1out << endl; - ShowBroken(c1out,Cache,false); - return _error->Error(_("Broken packages")); - } - /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@ -1601,8 +1762,8 @@ bool DoInstall(CommandLine &CmdL) if (*J == 0) { List += string(I.Name()) + " "; - VersionsList += string(Cache[I].CandVersion) + "\n"; - } + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); @@ -1699,6 +1860,14 @@ bool DoInstall(CommandLine &CmdL) } + // if nothing changed in the cache, but only the automark information + // we write the StateFile here, otherwise it will be written in + // cache.commit() + if (AutoMarkChanged > 0 && + Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + Cache->writeStateFile(NULL); + // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); @@ -1737,6 +1906,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false) return false; + pkgDepCache::ActionGroup group(Cache); + // Install everything with the install flag set pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) @@ -1955,6 +2126,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + continue; + // don't download the same uri twice (should this be moved to // the fetcher interface itself?) if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) @@ -1994,8 +2170,13 @@ bool DoSource(CommandLine &CmdL) return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("You don't have enough free space in %s"), - OutputDir.c_str()); + { + struct statfs Stat; + if (statfs(OutputDir.c_str(),&Stat) != 0 || + unsigned(Stat.f_type) != RAMFS_MAGIC) + return _error->Error(_("You don't have enough free space in %s"), + OutputDir.c_str()); + } // Number of bytes if (DebBytes != FetchBytes) @@ -2018,7 +2199,7 @@ bool DoSource(CommandLine &CmdL) pkgAcquire::UriIterator I = Fetcher.UriBegin(); for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << - I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; return true; } @@ -2278,6 +2459,7 @@ bool DoBuildDep(CommandLine &CmdL) break; } if (CV.end() == true) + { if (hasAlternatives) { continue; @@ -2290,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL) Last->BuildDepType((*D).Type),Src.c_str(), (*D).Package.c_str()); } + } } else { @@ -2334,6 +2517,8 @@ bool DoBuildDep(CommandLine &CmdL) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) + Cache->MarkAuto(Pkg, true); continue; } else if (hasAlternatives) @@ -2389,8 +2574,8 @@ bool DoMoo(CommandLine &CmdL) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) { @@ -2448,6 +2633,8 @@ bool ShowHelp(CommandLine &CmdL) " 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" @@ -2463,7 +2650,7 @@ bool ShowHelp(CommandLine &CmdL) " -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 continue if the integrity check fails\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" @@ -2489,6 +2676,7 @@ void GetInitialize() _config->Set("APT::Get::Fix-Broken",false); _config->Set("APT::Get::Force-Yes",false); _config->Set("APT::Get::List-Cleanup",true); + _config->Set("APT::Get::AutomaticRemove",false); } /*}}}*/ // SigWinch - Window size change signal handler /*{{{*/ @@ -2508,15 +2696,6 @@ void SigWinch(int) int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, @@ -2545,7 +2724,8 @@ int main(int argc,const char *argv[]) {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, - {0,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, @@ -2553,7 +2733,10 @@ int main(int argc,const char *argv[]) {0,"remove","APT::Get::Remove",0}, {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, + {0,"auto-remove","APT::Get::AutomaticRemove",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, + {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, + {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; @@ -2561,6 +2744,9 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"purge",&DoInstall}, + {"autoremove",&DoInstall}, + {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, @@ -2574,7 +2760,7 @@ int main(int argc,const char *argv[]) // Set up gettext support setlocale(LC_ALL,""); - //textdomain(PACKAGE); + textdomain(PACKAGE); // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); diff --git a/cmdline/apt-key b/cmdline/apt-key index 90ecae2..7bb3024 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,17 +1,81 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" +GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" +MASTER_KEYRING="" +ARCHIVE_KEYRING_URI="" +#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg +#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg + ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +add_keys_with_verify_against_master_keyring() { + ADD_KEYRING=$1 + MASTER=$2 + + if [ ! -f "$ADD_KEYRING" ]; then + echo "ERROR: '$ADD_KEYRING' not found" + return + fi + if [ ! -f "$MASTER" ]; then + echo "ERROR: '$MASTER' not found" + return + fi + + # when adding new keys, make sure that the archive-master-keyring + # is honored. so: + # all keys that are exported must have a valid signature + # from a key in the $distro-master-keyring + add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` + master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5` + for add_key in $add_keys; do + ADDED=0 + for master_key in $master_keys; do + if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then + $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import + ADDED=1 + fi + done + if [ $ADDED = 0 ]; then + echo >&2 "Key '$add_key' not added. It is not signed with a master key" + fi + done +} + +# update the current archive signing keyring from a network URI +# the archive-keyring keys needs to be signed with the master key +# (otherwise it does not make sense from a security POV) +net_update() { + if [ -z "$ARCHIVE_KEYRING_URI" ]; then + echo "ERROR: no location for the archive-keyring given" + fi + if [ ! -d /var/lib/apt/keyrings ]; then + mkdir -p /var/lib/apt/keyrings + fi + keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) + old_mtime=0 + if [ -e $keyring ]; then + old_mtime=$(stat -c %Y $keyring) + fi + (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) + if [ ! -e $keyring ]; then + return + fi + new_mtime=$(stat -c %Y $keyring) + if [ $new_mtime -ne $old_mtime ]; then + echo "Checking for new archive signing keys now" + add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING + fi +} update() { if [ ! -f $ARCHIVE_KEYRING ]; then @@ -20,10 +84,16 @@ update() { exit 1 fi - # add new keys - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import + # add new keys from the package; + + # we do not use add_keys_with_verify_against_master_keyring here, + # because "update" is run on regular package updates. A + # attacker might as well replace the master-archive-keyring file + # in the package and add his own keys. so this check wouldn't + # add any security. we *need* this check on net-update though + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import - # remove no-longer used keys + # remove no-longer supported/used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` for key in $keys; do if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then @@ -32,6 +102,7 @@ update() { done } + usage() { echo "Usage: apt-key [command] [arguments]" echo @@ -39,8 +110,13 @@ usage() { echo echo " apt-key add - add the key contained in ('-' for stdin)" echo " apt-key del - remove the key " + echo " apt-key export - output the key " + echo " apt-key exportall - output all trusted keys" echo " apt-key update - update keys using the keyring package" + echo " apt-key net-update - update keys using the network" echo " apt-key list - list keys" + echo " apt-key finger - list fingerprints" + echo " apt-key adv - pass advanced options to gpg (download key)" echo } @@ -69,12 +145,21 @@ case "$command" in update) update ;; + net-update) + net_update + ;; list) $GPG --batch --list-keys ;; finger*) $GPG --batch --fingerprint ;; + export) + $GPG --armor --export "$1" + ;; + exportall) + $GPG --armor --export + ;; adv*) echo "Executing: $GPG $*" $GPG $* diff --git a/cmdline/apt-mark b/cmdline/apt-mark new file mode 100755 index 0000000..f6e749e --- /dev/null +++ b/cmdline/apt-mark @@ -0,0 +1,65 @@ +#!/usr/bin/python + +from optparse import OptionParser + +try: + import apt_pkg +except ImportError: + print "Error importing apt_pkg, is python-apt installed?" + +import sys +import os.path + +actions = { "markauto" : 1, + "unmarkauto": 0 + } + +if __name__ == "__main__": + apt_pkg.init() + + # option parsing + parser = OptionParser() + parser.usage = "%prog [options] {markauto|unmarkauto} packages..." + parser.add_option("-f", "--file", action="store", type="string", + dest="filename", + help="read/write a different file") + parser.add_option("-v", "--verbose", + action="store_true", dest="verbose", default=False, + help="print verbose status messages to stdout") + (options, args) = parser.parse_args() + if len(args) < 2: + parser.error("not enough argument") + + # get pkgs to change + if args[0] not in actions.keys(): + parser.error("first argument must be 'markauto' or 'unmarkauto'") + pkgs = args[1:] + action = actions[args[0]] + + # get the state-file + if not options.filename: + STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + else: + STATE_FILE=options.filename + + # open the statefile + if os.path.exists(STATE_FILE): + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + while tagfile.Step(): + pkgname = tagfile.Section.get("Package") + autoInst = tagfile.Section.get("Auto-Installed") + if pkgname in pkgs: + if options.verbose: + print "changing %s to %s" % (pkgname,action) + newsec = apt_pkg.RewriteSection(tagfile.Section, + [], + [ ("Auto-Installed",str(action)) ] + ) + outfile.write(newsec+"\n") + else: + outfile.write(str(tagfile.Section)+"\n") + # all done, rename the tmpfile + os.chmod(outfile.name, 0644) + os.rename(outfile.name, STATE_FILE) + os.chmod(STATE_FILE, 0644) diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 8624bd7..8bb5c56 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $ @@ -145,8 +141,8 @@ bool DoIt(string InFile) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; @@ -166,17 +162,8 @@ int ShowHelp() } /*}}}*/ -int main(unsigned int argc,const char *argv[]) +int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/cmdline/apt-sortpkgs.cc.orig b/cmdline/apt-sortpkgs.cc.orig deleted file mode 100644 index bec90ae..0000000 --- a/cmdline/apt-sortpkgs.cc.orig +++ /dev/null @@ -1,221 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $ -/* ###################################################################### - - APT Sort Packages - Program to sort Package and Source files - - This program is quite simple, it just sorts the package files by - package and sorts the fields inside by the internal APT sort order. - Input is taken from a named file and sent to stdout. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include -#include - /*}}}*/ - -using namespace std; - -struct PkgName -{ - string Name; - string Ver; - string Arch; - unsigned long Offset; - unsigned long Length; - - inline int Compare3(const PkgName &x) const - { - int A = stringcasecmp(Name,x.Name); - if (A == 0) - { - A = stringcasecmp(Ver,x.Ver); - if (A == 0) - A = stringcasecmp(Arch,x.Arch); - } - return A; - } - - bool operator <(const PkgName &x) const {return Compare3(x) < 0;}; - 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 /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DoIt(string InFile) -{ - FileFd Fd(InFile,FileFd::ReadOnly); - pkgTagFile Tags(&Fd); - if (_error->PendingError() == true) - return false; - - // Parse. - vector List; - pkgTagSection Section; - unsigned long Largest = 0; - unsigned long Offset = Tags.Offset(); - bool Source = _config->FindB("APT::SortPkgs::Source",false); - while (Tags.Step(Section) == true) - { - PkgName Tmp; - - /* Fetch the name, auto-detecting if this is a source file or a - package file */ - Tmp.Name = Section.FindS("Package"); - Tmp.Ver = Section.FindS("Version"); - Tmp.Arch = Section.FindS("Architecture"); - - if (Tmp.Name.empty() == true) - return _error->Error(_("Unknown package record!")); - - Tmp.Offset = Offset; - Tmp.Length = Section.size(); - if (Largest < Tmp.Length) - Largest = Tmp.Length; - - List.push_back(Tmp); - - Offset = Tags.Offset(); - } - if (_error->PendingError() == true) - return false; - - // Sort it - sort(List.begin(),List.end()); - - const char **Order = TFRewritePackageOrder; - if (Source == true) - Order = TFRewriteSourceOrder; - - // Emit - unsigned char *Buffer = new unsigned char[Largest+1]; - for (vector::iterator I = List.begin(); I != List.end(); I++) - { - // Read in the Record. - if (Fd.Seek(I->Offset) == false || Fd.Read(Buffer,I->Length) == false) - { - delete [] Buffer; - return false; - } - - Buffer[I->Length] = '\n'; - if (Section.Scan((char *)Buffer,I->Length+1) == false) - { - delete [] Buffer; - return _error->Error("Internal error, failed to scan buffer"); - } - - // Sort the section - if (TFRewrite(stdout,Section,Order,0) == false) - { - delete [] Buffer; - return _error->Error("Internal error, failed to sort fields"); - } - - fputc('\n',stdout); - } - - delete [] Buffer; - return true; -} - /*}}}*/ -// ShowHelp - Show the help text /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int ShowHelp() -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - if (_config->FindB("version") == true) - return 0; - - cout << - _("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"); - - return 0; -} - /*}}}*/ - -int main(unsigned int argc,const char *argv[]) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {'v',"version","version",0}, - {'s',"source","APT::SortPkgs::Source",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - - // Set up gettext support - setlocale(LC_ALL,""); - //textdomain(PACKAGE); - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (pkgInitConfig(*_config) == false || - CmdL.Parse(argc,argv) == false || - pkgInitSystem(*_config,_system) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - CmdL.FileSize() == 0) - return ShowHelp(); - - // Match the operation - for (unsigned int I = 0; I != CmdL.FileSize(); I++) - if (DoIt(CmdL.FileList[I]) == false) - break; - - // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; -} diff --git a/cmdline/makefile b/cmdline/makefile index 882a0e1..3260e37 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -7,42 +7,42 @@ include ../buildlib/defaults.mak # The apt-cache program PROGRAM=apt-cache -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-cache.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) # The apt-config program PROGRAM=apt-config -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-config.cc include $(PROGRAM_H) # The apt-cdrom program PROGRAM=apt-cdrom -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-cdrom.cc include $(PROGRAM_H) # The apt-sortpkgs program PROGRAM=apt-sortpkgs -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-sortpkgs.cc include $(PROGRAM_H) # The apt-extracttemplates program PROGRAM=apt-extracttemplates -SLIBS = -lapt-pkg -lapt-inst +SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-extracttemplates.cc include $(PROGRAM_H) @@ -52,3 +52,9 @@ SOURCE=apt-key TO=$(BIN) TARGET=program include $(COPY_H) + +# The apt-mark program +SOURCE=apt-mark +TO=$(BIN) +TARGET=program +include $(COPY_H) diff --git a/configure b/configure index 2b08e9d..7303d20 100755 --- a/configure +++ b/configure @@ -613,6 +613,7 @@ ac_includes_default="\ # include #endif" +gt_needs= ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME @@ -687,8 +688,12 @@ HAVE_C9X NEED_SOCKLEN_T_DEFINE DEBIANDOC_HTML DEBIANDOC_TEXT +DOXYGEN DOCBOOK2MAN XMLTO +HAVE_DOT +DOT +DOTDIR GETCONF NUM_CPUS PROC_MULTIPLY @@ -702,6 +707,7 @@ INSTALL_SCRIPT INSTALL_DATA mkdir_p USE_NLS +GETTEXT_MACRO_VERSION MSGFMT GMSGFMT MSGFMT_015 @@ -709,6 +715,7 @@ GMSGFMT_015 XGETTEXT XGETTEXT_015 MSGMERGE +XGETTEXT_EXTRA_OPTIONS INTL_MACOSX_LIBS LIBICONV LTLIBICONV @@ -1683,6 +1690,7 @@ echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -1790,7 +1798,7 @@ ac_config_headers="$ac_config_headers include/config.h:buildlib/config.h.in incl cat >>confdefs.h <<_ACEOF -#define VERSION "0.6.46.4-0.1" +#define VERSION "0.7.20.2" _ACEOF PACKAGE="apt" @@ -4490,30 +4498,221 @@ fi LIBS="$saveLIBS" +{ echo "$as_me:$LINENO: checking for curl_easy_init in -lcurl" >&5 +echo $ECHO_N "checking for curl_easy_init in -lcurl... $ECHO_C" >&6; } +if test "${ac_cv_lib_curl_curl_easy_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char curl_easy_init (); +int +main () +{ +return curl_easy_init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_curl_curl_easy_init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_curl_curl_easy_init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_init" >&5 +echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_init" >&6; } +if test $ac_cv_lib_curl_curl_easy_init = yes; then + if test "${ac_cv_header_curl_curl_h+set}" = set; then + { echo "$as_me:$LINENO: checking for curl/curl.h" >&5 +echo $ECHO_N "checking for curl/curl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_curl_curl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_curl_curl_h" >&5 +echo "${ECHO_T}$ac_cv_header_curl_curl_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking curl/curl.h usability" >&5 +echo $ECHO_N "checking curl/curl.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking curl/curl.h presence" >&5 +echo $ECHO_N "checking curl/curl.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: curl/curl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: curl/curl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: curl/curl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: curl/curl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: curl/curl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: curl/curl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: curl/curl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: curl/curl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: curl/curl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: curl/curl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: curl/curl.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for curl/curl.h" >&5 +echo $ECHO_N "checking for curl/curl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_curl_curl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_curl_curl_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_curl_curl_h" >&5 +echo "${ECHO_T}$ac_cv_header_curl_curl_h" >&6; } + +fi +if test $ac_cv_header_curl_curl_h = yes; then + curl_ok=yes +else + curl_ok=no +fi + + +else + { { echo "$as_me:$LINENO: error: failed: I need CURL due https support" >&5 +echo "$as_me: error: failed: I need CURL due https support" >&2;} + { (exit 1); exit 1; }; } +fi + -{ echo "$as_me:$LINENO: checking system architecture" >&5 -echo $ECHO_N "checking system architecture... $ECHO_C" >&6; } -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" + +{ echo "$as_me:$LINENO: checking debian architecture" >&5 +echo $ECHO_N "checking debian architecture... $ECHO_C" >&6; } +archset="`dpkg-architecture -qDEB_HOST_ARCH`" if test "x$archset" = "x"; then - { { echo "$as_me:$LINENO: error: failed: use --host= or check buildlib/archtable" >&5 -echo "$as_me: error: failed: use --host= or check buildlib/archtable" >&2;} + { { echo "$as_me:$LINENO: error: failed: use --host= or output from dpkg-architecture" >&5 +echo "$as_me: error: failed: use --host= or output from dpkg-architecture" >&2;} { (exit 1); exit 1; }; } fi { echo "$as_me:$LINENO: result: $archset" >&5 echo "${ECHO_T}$archset" >&6; } cat >>confdefs.h <<_ACEOF -#define COMMON_CPU "$archset" -_ACEOF - - -{ echo "$as_me:$LINENO: checking system OS" >&5 -echo $ECHO_N "checking system OS... $ECHO_C" >&6; } -osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" -{ echo "$as_me:$LINENO: result: $osset" >&5 -echo "${ECHO_T}$osset" >&6; } -cat >>confdefs.h <<_ACEOF -#define COMMON_OS "$osset" +#define COMMON_ARCH "$archset" _ACEOF @@ -6828,6 +7027,47 @@ fi +# Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_DOXYGEN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $DOXYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +DOXYGEN=$ac_cv_path_DOXYGEN +if test -n "$DOXYGEN"; then + { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 +echo "${ECHO_T}$DOXYGEN" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + # Extract the first word of "docbook2man", so it can be a program name with args. set dummy docbook2man; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6910,6 +7150,87 @@ fi +# Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_HAVE_DOT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$HAVE_DOT"; then + ac_cv_prog_HAVE_DOT="$HAVE_DOT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_HAVE_DOT="YES" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO" +fi +fi +HAVE_DOT=$ac_cv_prog_HAVE_DOT +if test -n "$HAVE_DOT"; then + { echo "$as_me:$LINENO: result: $HAVE_DOT" >&5 +echo "${ECHO_T}$HAVE_DOT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_DOT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $DOT in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOT="$DOT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +DOT=$ac_cv_path_DOT +if test -n "$DOT"; then + { echo "$as_me:$LINENO: result: $DOT" >&5 +echo "${ECHO_T}$DOT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +DOTDIR=$(dirname $DOT) + + # Check whether --with-getconf was given. @@ -7186,7 +7507,7 @@ echo "${ECHO_T}yes, for $GCC_MD" >&6; } -ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` @@ -7297,38 +7618,53 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 @@ -7346,6 +7682,9 @@ echo "${ECHO_T}$USE_NLS" >&6; } + GETTEXT_MACRO_VERSION=0.17 + + # Prepare PATH_SEPARATOR. @@ -7621,6 +7960,9 @@ fi test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" @@ -7773,12 +8115,14 @@ fi { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 echo "${ECHO_T}$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; : @@ -7813,6 +8157,7 @@ fi + use_additional=yes acl_save_prefix="$prefix" @@ -7857,6 +8202,7 @@ fi LIBICONV= LTLIBICONV= INCICONV= + LIBICONV_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -7890,21 +8236,51 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi fi fi if test "X$found_dir" = "X"; then @@ -7921,20 +8297,43 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi fi ;; esac @@ -7959,10 +8358,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" haveit= for x in $rpathdirs; do @@ -7994,7 +8393,7 @@ fi if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -8013,6 +8412,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBICONV_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -8163,21 +8563,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -8201,6 +8601,13 @@ fi + + + + + + + @@ -8342,17 +8749,37 @@ _ACEOF LTLIBINTL= POSUB= + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - - - + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then +if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8362,13 +8789,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; int main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } @@ -8391,21 +8819,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - gt_cv_func_gnugettext1_libc=yes + eval "$gt_func_gnugettext_libc=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_func_gnugettext1_libc=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; } +ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -8547,6 +8976,132 @@ fi { echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { echo "$as_me:$LINENO: checking for working iconv" >&5 +echo $ECHO_N "checking for working iconv... $ECHO_C" >&6; } +if test "${am_cv_func_iconv_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_func_iconv_works=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + LIBS="$am_save_LIBS" + +fi +{ echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5 +echo "${ECHO_T}$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 @@ -8570,6 +9125,7 @@ echo "${ECHO_T}$LIBICONV" >&6; } + use_additional=yes acl_save_prefix="$prefix" @@ -8614,6 +9170,7 @@ fi LIBINTL= LTLIBINTL= INCINTL= + LIBINTL_PREFIX= rpathdirs= ltrpathdirs= names_already_handled= @@ -8647,21 +9204,51 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi fi fi if test "X$found_dir" = "X"; then @@ -8678,20 +9265,43 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi fi ;; esac @@ -8716,10 +9326,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -8751,7 +9361,7 @@ fi if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -8770,6 +9380,7 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + LIBINTL_PREFIX="$basedir" additional_includedir="$basedir/include" ;; esac @@ -8920,21 +9531,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -8948,7 +9559,7 @@ fi { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; } -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then +if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -8962,6 +9573,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus @@ -8972,7 +9584,7 @@ int main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -8995,17 +9607,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_func_gnugettext1_libintl=no + eval "$gt_func_gnugettext_libintl=no" fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9014,6 +9626,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus @@ -9024,7 +9637,7 @@ int main () { bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -9049,7 +9662,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 $as_test_x conftest$ac_exeext; then LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" else echo "$as_me: failed program was:" >&5 @@ -9064,12 +9677,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } +ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -9109,7 +9723,7 @@ echo "${ECHO_T}$USE_NLS" >&6; } { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -9124,7 +9738,7 @@ echo "${ECHO_T}$gt_source" >&6; } if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then { echo "$as_me:$LINENO: checking how to link with libintl" >&5 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; } { echo "$as_me:$LINENO: result: $LIBINTL" >&5 @@ -9226,7 +9840,7 @@ fi -ac_config_files="$ac_config_files environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in" +ac_config_files="$ac_config_files environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile" ac_config_commands="$ac_config_commands default" @@ -9690,6 +10304,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -9803,6 +10418,7 @@ do "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "environment.mak") CONFIG_FILES="$CONFIG_FILES environment.mak:buildlib/environment.mak.in" ;; "makefile") CONFIG_FILES="$CONFIG_FILES makefile:buildlib/makefile.in" ;; + "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -9940,8 +10556,12 @@ HAVE_C9X!$HAVE_C9X$ac_delim NEED_SOCKLEN_T_DEFINE!$NEED_SOCKLEN_T_DEFINE$ac_delim DEBIANDOC_HTML!$DEBIANDOC_HTML$ac_delim DEBIANDOC_TEXT!$DEBIANDOC_TEXT$ac_delim +DOXYGEN!$DOXYGEN$ac_delim DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim XMLTO!$XMLTO$ac_delim +HAVE_DOT!$HAVE_DOT$ac_delim +DOT!$DOT$ac_delim +DOTDIR!$DOTDIR$ac_delim GETCONF!$GETCONF$ac_delim NUM_CPUS!$NUM_CPUS$ac_delim PROC_MULTIPLY!$PROC_MULTIPLY$ac_delim @@ -9955,14 +10575,10 @@ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim mkdir_p!$mkdir_p$ac_delim USE_NLS!$USE_NLS$ac_delim +GETTEXT_MACRO_VERSION!$GETTEXT_MACRO_VERSION$ac_delim MSGFMT!$MSGFMT$ac_delim GMSGFMT!$GMSGFMT$ac_delim MSGFMT_015!$MSGFMT_015$ac_delim -GMSGFMT_015!$GMSGFMT_015$ac_delim -XGETTEXT!$XGETTEXT$ac_delim -XGETTEXT_015!$XGETTEXT_015$ac_delim -MSGMERGE!$MSGMERGE$ac_delim -INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -10004,6 +10620,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GMSGFMT_015!$GMSGFMT_015$ac_delim +XGETTEXT!$XGETTEXT$ac_delim +XGETTEXT_015!$XGETTEXT_015$ac_delim +MSGMERGE!$MSGMERGE$ac_delim +XGETTEXT_EXTRA_OPTIONS!$XGETTEXT_EXTRA_OPTIONS$ac_delim +INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim LIBICONV!$LIBICONV$ac_delim LTLIBICONV!$LTLIBICONV$ac_delim INTLLIBS!$INTLLIBS$ac_delim @@ -10015,7 +10637,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -10242,6 +10864,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -10295,6 +10922,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out diff --git a/configure.in b/configure.in index 22ea296..5fb5fd2 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.6.46.4-0.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -74,24 +74,26 @@ AC_CHECK_HEADER(db.h, LIBS="$saveLIBS" +AC_CHECK_LIB(curl, curl_easy_init, + [AC_CHECK_HEADER(curl/curl.h, + curl_ok=yes, + curl_ok=no)], + AC_MSG_ERROR([failed: I need CURL due https support]), +) + AC_SUBST(BDBLIB) dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. -AC_MSG_CHECKING(system architecture) -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" +dnl First check against the full canonical canoncial-system-type in $target +dnl and if that fails, just look for the cpu +AC_MSG_CHECKING(debian architecture) +archset="`cd "$DPKG_ARCH"; PERL5LIB=$(pwd) ./dpkg-architecture -qDEB_HOST_ARCH -t$host`" if test "x$archset" = "x"; then - AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) + AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) fi AC_MSG_RESULT($archset) -AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") - -dnl Get a common name for the host OS - this is primarily only for HURD and is -dnl non fatal if it fails -AC_MSG_CHECKING(system OS) -osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" -AC_MSG_RESULT($osset) -AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") +AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") dnl We use C99 types if at all possible AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ @@ -175,12 +177,21 @@ dnl Check for debiandoc AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + dnl Check for the SGML tools needed to build man pages AC_PATH_PROG(DOCBOOK2MAN,docbook2man) dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) +dnl Check for graphviz +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) +AC_PATH_PROG([DOT], [dot], []) +DOTDIR=$(dirname $DOT) +AC_SUBST(DOTDIR) + dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") @@ -192,7 +203,7 @@ ah_GCC3DEP dnl It used to be that the user could select translations and that could get dnl passed to the makefiles, but now that can only work if you use special dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) @@ -200,4 +211,4 @@ fi AC_SUBST(USE_NLS) AC_PATH_PROG(BASH, bash) -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs) diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index d9f9836..0000000 --- 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/README.source b/debian/README.source new file mode 100644 index 0000000..9da1525 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,6 @@ +Build this package with: +$ debian/rules arch-build +or +$ DEB_BUILD_PROG_OPTS="-S" debian/rules arch-build + +make sure you have the pre-build-depds in README.arch installed diff --git a/debian/apt-transport-https.README b/debian/apt-transport-https.README new file mode 100644 index 0000000..0c470a1 --- /dev/null +++ b/debian/apt-transport-https.README @@ -0,0 +1,2 @@ +See APT::https group of options in apt.conf(5) to configure how APT will handle +https:// URIs. diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove new file mode 100644 index 0000000..98143ce --- /dev/null +++ b/debian/apt.conf.autoremove @@ -0,0 +1,8 @@ +APT +{ + NeverAutoRemove + { + "^linux-image.*"; + "^linux-restricted-modules.*"; + }; +}; diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 26dfa25..32fbafc 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,12 @@ # "APT::Periodic::AutocleanInterval" # - Do "apt-get autoclean" every n-days (0=disable) # +# "APT::Periodic::Unattended-Upgrade" +# - Run the "unattended-upgrade" security upgrade script +# every n-days (0=disabled) +# Requires the package "unattended-upgrades" and will write +# a log in /var/log/unattended-upgrades +# # "APT::Archives::MaxAge", # - Set maximum allowed age of a cache package file. If a cache # package file is older it is deleted (0=disable) @@ -141,12 +147,44 @@ check_size_constraints() fi } +# sleep for a random interval of time (default 30min) +# (some code taken from cron-apt, thanks) +random_sleep() +{ + RandomSleep=1800 + eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) + if [ $RandomSleep -eq 0 ]; then + return + fi + if [ -z "$RANDOM" ] ; then + # A fix for shells that do not have this bash feature. + RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + fi + TIME=$(($RANDOM % $RandomSleep)) + sleep $TIME +} + +# main + +if ! which apt-config >/dev/null; then + exit 0 +fi UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) AutocleanInterval=$DownloadUpgradeableInterval -eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean) +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) +UnattendedUpgradeInterval=0 +eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) + +# check if we actually have to do anything +if [ $UpdateInterval -eq 0 ] && + [ $DownloadUpgradeableInterval -eq 0 ] && + [ $UnattendedUpgradeInterval -eq 0 ] && + [ $AutocleanInterval -eq 0 ]; then + exit 0 +fi # laptop check, on_ac_power returns: # 0 (true) System is on mains power @@ -160,12 +198,28 @@ if which on_ac_power >/dev/null; then fi fi +# sleep random amount of time to avoid hitting the +# mirrors at the same time +random_sleep + +# check if we can access the cache +if ! apt-get check -q -q 2>/dev/null; then + # wait random amount of time before retrying + random_sleep + # check again + if ! apt-get check -q -q 2>/dev/null; then + echo "$0: could not lock the APT cache while performing daily cron job. " + echo "Is another package manager working?" + exit 1 + fi +fi + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if apt-get -qq update 2>/dev/null; then - if which dbus-send >/dev/null; then - dbus-send --system / app.apt.dbus.updated boolean:true - fi + if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then + dbus-send --system / app.apt.dbus.updated boolean:true + fi update_stamp $UPDATE_STAMP fi fi @@ -176,6 +230,12 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP fi +UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp +if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + unattended-upgrade + update_stamp $UPGRADE_STAMP +fi + AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then apt-get -qq autoclean diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738..47f60e7 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,8 +2,12 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/apt.conf.d etc/apt/sources.list.d +etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic +var/log/apt usr/share/bug/apt +usr/share/lintian/overrides diff --git a/debian/apt.logrotate b/debian/apt.logrotate new file mode 100644 index 0000000..3e924d3 --- /dev/null +++ b/debian/apt.logrotate @@ -0,0 +1,8 @@ +/var/log/apt/term.log { + rotate 6 + monthly + compress + missingok + notifempty +} + diff --git a/debian/apt.manpages b/debian/apt.manpages index b52ea3d..3c9c8a4 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -3,6 +3,7 @@ doc/apt-cdrom.8 doc/apt-config.8 doc/apt-get.8 doc/apt-key.8 +doc/apt-mark.8 doc/apt-secure.8 doc/apt.8 doc/apt.conf.5 diff --git a/debian/changelog b/debian/changelog index 9adaa34..eaff397 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,938 @@ -apt (0.6.46.4-0.1) unstable; urgency=emergency +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 ] + * 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. + + -- Michael Vogt Tue, 20 Jan 2009 09:35:05 +0100 + +apt (0.7.20) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/changelog: + - Fixed place of 'merged install-recommends and install-task branches' + from 0.6.46.1 to 0.7.0. (Closes: #439866) + * buildlib/config.{sub,guess}: + - Renewed. This fixes lintian errors. + * doc/apt.conf.5.xml, debian/apt-transport-https: + - Documented briefly 'APT::https' group of options. (Closes: #507398) + - Applied patch from Daniel Burrows to document 'Debug' group of options. + (Closes: #457265) + - 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) + * 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 + 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: #448743 + * apt-inst/contrib/arfile.cc: + - support members ending with '/' as well (thanks to Michal Cihr, + closes: #500988) + + [ Christian Perrier ] + * Translations: + - Finnish updated. Closes: #508449 + - Galician updated. Closes: #509151 + - Catalan updated. Closes: #509375 + - Vietnamese updated. Closes: #509422 + - Traditional Chinese added. Closes: #510664 + - French corrected (remove awful use of first person) + + -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 + +apt (0.7.19) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * doc/sources.list.5.xml: + - Mentioned allowed characters in file names in /etc/apt/sources.list.d. + Thanks to Matthias Urlichs. (Closes: #426913) + * doc/apt-get.8.xml: + - Explicitly say that 'dist-upgrade' command may remove packages. + - Included '-v'/'--version' as a command to synopsis. + * cmdline/apt-cache.cc: + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) + - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) + - Removed asking to file a release-critical bug against a package if there + is a request to install only one package and it is not installable. + (Closes: #419521) + + [ Michael Vogt ] + - fix SIGHUP handling (closes: #463030) + + [ Christian Perrier ] + * Translations: + - French updated + - Bulgarian updated. Closes: #505476 + - Slovak updated. Closes: #505483 + - Swedish updated. Closes: #505491 + - Japanese updated. Closes: #505495 + - Korean updated. Closes: #505506 + - Catalan updated. Closes: #505513 + - British English updated. Closes: #505539 + - Italian updated. Closes: #505518, #505683 + - Polish updated. Closes: #505569 + - German updated. Closes: #505614 + - Spanish updated. Closes: #505757 + - Romanian updated. Closes: #505762 + - Simplified Chinese updated. Closes: #505727 + - Portuguese updated. Closes: #505902 + - Czech updated. Closes: #505909 + - Norwegian Bokmål updated. Closes: #505934 + - Brazilian Portuguese updated. Closes: #505949 + - Basque updated. Closes: #506085 + - Russian updated. Closes: #506452 + - Marathi updated. + - Ukrainian updated. Closes: #506545 + + -- Michael Vogt Mon, 24 Nov 2008 10:33:54 +0100 + +apt (0.7.18) unstable; urgency=low + + [ Christian Perrier ] + * Translations: + - French updated + - Thai updated. Closes: #505067 + + [ Eugene V. Lyubimkin ] + * doc/examples/configure-index: + - Removed obsoleted header line. (Closes: #417638) + - Changed 'linux-kernel' to 'linux-image'. + * doc/sources.list.5.xml: + - Fixed typo and grammar in 'sources.list.d' section. Thanks to + Timothy G Abbott . (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) + + [ Michael Vogt ] + * fix depend on libdb4.4 (closes: #501253) + + -- Michael Vogt Fri, 07 Nov 2008 22:13:39 +0100 + +apt (0.7.17) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * debian/control: + - 'Vcs-Bzr' field is official, used it. + - Bumped 'Standards-Version' to 3.8.0, no changes needed. + - Actualized 'Uploaders' field. + * doc/: + - Substituded 'apt-archive' with 'apt-ftparchive' in docs. + Patch based on work of Andre Felipe Machado. (Closes: #350865) + - Mentioned '/' and '=' for 'apt-get install' and + '=' for 'apt-get source' in apt-get manpage. Patch based on + work of Andre Felipe Machado. (Closes: #399673) + - Mentioned more short options in the apt-get manpage. Documented 'xvcg' + option in the apt-cache manpage. The part of patch by Andre Felipe + Machado. (Closes: #176106, #355945) + - Documented that 'apt-get install' command should be used for upgrading + some of installed packages. Based on patch by Nori Heikkinen and + Andre Felipe Machado. (Closes: #267087) + - Mentioned 'apt_preferences(5)' in apt manpage. (Closes: #274295) + - Documented 'APT::Default-Release' in apt.conf manpage. (Closes: #430399) + - APT::Install-Recommends is now true by default, mentioned this in + configure-index example. (Closes: #463268) + - Added 'APT::Get::AllowUnauthenticated' to configure-index example. + (Closes: #320225) + - Documented '--no-install-recommends' option in apt-get manpage. + (Closes: #462962) + - Documented 'Acquire::PDiffs' in apt.conf manpage. (Closes: #376029) + - Added 'copy', 'rsh', 'ssh' to the list of recognized URI schemes in + sources.list manpage, as they are already described under in the manpage. + - Removed notice that ssh/rsh access cannot use password authentication + from sources.list manpage. Thanks to Steffen Joeris. (Closes: #434894) + - Added '(x)' to some referrings to manpages in apt-get manpage. Patch by + Andre Felipe Machado. (Closes: #309893) + - Added 'dist-upgrade' apt-get synopsis in apt-get manpage. + (Closes: #323866) + + -- Michael Vogt Wed, 05 Nov 2008 13:14:56 +0100 + +apt (0.7.17~exp4) experimental; urgency=low + + * debian/rules: + - Fixed lintian warnings "debian/rules ignores make errors". + * debian/control: + - Substituted outdated "Source-Version" fields with "binary:Version". + - Added 'python-apt' to Suggests, as apt-mark need it for work. + - Drop Debian revision from 'doc-base' build dependency, this fixes + appropriate lintian warning. + * debian/libapt-pkg-doc.doc-base.*: + - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate + lintian warnings. + * debian/{postrm,prerm,preinst}: + - Added 'set -e', fixes lintian warnings + 'maintainer-script-ignores-error'. + * dselect/makefile: + - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. + * share/lintian-overrides: + - Added with override of 'apt must depend on python'. Script 'apt-mark' + needs apt-python for working and checks this on fly. We don't want + python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) + + -- Eugene V. Lyubimkin Fri, 31 Oct 2008 23:45:17 +0300 + +apt (0.7.17~exp3) experimental; urgency=low + + * apt-pkg/acquire-item.cc: + - fix a merge mistake that prevents the fallback to the + uncompressed 'Packages' to work correctly (closes: #409284) + + -- Michael Vogt Wed, 29 Oct 2008 09:36:24 +0100 + +apt (0.7.17~exp2) experimental; urgency=low + + [ Eugene V. Lyubimkin ] + * apt-pkg/acquire-item.cc: + - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' + available. (Closes: #409284) + * apt-pkg/algorithm.cc: + - Strip username and password from source URL in error message. + (Closes: #425150) + + [ Michael Vogt ] + * fix various -Wall warnings + + -- Michael Vogt Tue, 28 Oct 2008 18:06:38 +0100 + +apt (0.7.17~exp1) experimental; urgency=low + + [ Luca Bruno ] + * Fix typos: + - apt-pkg/depcache.cc + * Fix compilation warnings: + - apt-pkg/acquire.cc + - apt-pkg/versionmatch.cc + * Compilation fixes and portability improvement for compiling APT against non-GNU libc + (thanks to Martin Koeppe, closes: #392063): + - buildlib/apti18n.h.in: + + textdomain() and bindtextdomain() must not be visible when --disable-nls + - buildlib/inttypes.h.in: undefine standard int*_t types + - Append INTLLIBS to SLIBS: + + cmdline/makefile + + ftparchive/makefile + + methods/makefile + * doc/apt.conf.5.xml: + - clarify whether configuration items of apt.conf are case-sensitive + (thanks to Vincent McIntyre, closes: #345901) + + -- Luca Bruno Sat, 11 Oct 2008 09:17:46 +0200 + +apt (0.7.16) unstable; urgency=low + + [ Luca Bruno ] + * doc/apt-cache.8.xml: + - search command uses POSIX regex, and searches for virtual packages too + (closes: #277536) + * doc/offline.sgml: clarify remote and target hosts + (thanks to Nikolaus Schulz, closes: #175940) + * Fix several typos in docs, translations and debian/changelog + (thanks to timeless, Nicolas Bonifas and Josh Triplett, + closes: #368665, #298821, #411532, #431636, #461458) + * Document apt-key finger and adv commands + (thanks to Stefan Schmidt, closes: #350575) + * Better documentation for apt-get --option + (thanks to Tomas Pospisek, closes: #386579) + * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276) + * Better documentation on using both APT::Default-Release and + /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575) + + [ Michael Vogt ] + * doc/apt-cache.8.xml: + - add missing citerefentry + + -- Michael Vogt Fri, 10 Oct 2008 23:44:50 +0200 + +apt (0.7.15) unstable; urgency=low + + * Upload to unstable + + -- Michael Vogt Sun, 05 Oct 2008 13:23:47 +0200 + +apt (0.7.15~exp3) experimental; urgency=low + + [Daniel Burrows] + * apt-pkg/deb/dpkgpm.cc: + - Store the trigger state descriptions in a way that does not break + the ABI. The approach taken makes the search for a string O(n) rather + than O(lg(n)), but since n == 4, I do not consider this a major + concern. If it becomes a concern, we can sort the static array and + use std::equal_range(). (Closes: #499322) + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc: + - move the state file writting into the Go() implementation + of dpkgpm (closes: #498799) + * apt-pkg/algorithms.cc: + - fix simulation performance drop (thanks to Ferenc Wagner + for reporting the issue) + + -- Michael Vogt Wed, 01 Oct 2008 18:09:49 +0200 + +apt (0.7.15~exp2) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - do not add multiple identical descriptions for the same + language (closes: #400768) + + [ Program translations ] + * Catalan updated. Closes: #499462 + + -- Michael Vogt Tue, 23 Sep 2008 07:29:59 +0200 + +apt (0.7.15~exp1) experimental; urgency=low + + [ Christian Perrier ] + * Fix typo in cron.daily script. Closes: #486179 + + [ Program translations ] + * Traditional Chinese updated. Closes: #488526 + * German corrected and completed. Closes: #490532, #480002, #498018 + * French completed + * Bulgarian updated. Closes: #492473 + * Slovak updated. Closes: #492475 + * Galician updated. Closes: #492794 + * Japanese updated. Closes: #492975 + * Fix missing space in Greek translation. Closes: #493922 + * Greek updated. + * Brazilian Portuguese updated. + * Basque updated. Closes: #496754 + * Romanian updated. Closes: #492773, #488361 + * Portuguese updated. Closes: #491790 + * Simplified Chinese updated. Closes: #489344 + * Norwegian Bokmål updated. Closes: #480022 + * Czech updated. Closes: #479628, #497277 + * Korean updated. Closes: #464515 + * Spanish updated. Closes: #457706 + * Lithuanian added. Closes: #493328 + * Swedish updated. Closes: #497496 + * Vietnamese updated. Closes: #497893 + * Portuguese updated. Closes: #498411 + * Greek updated. Closes: #498687 + * Polish updated. + + [ Michael Vogt ] + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (closes: #485943) + * improve apt progress reporting, display trigger actions + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * doc/makefile: + - add examples/apt-https-method-example.conf + + -- Michael Vogt Tue, 16 Sep 2008 21:27:03 +0200 + +apt (0.7.14) unstable; urgency=low + + [ Christian Perrier ] + * Mark a message from dselect backend as translatable + Thanks to Frédéric Bothamy for the patch + Closes: #322470 + + [ Program translations ] + * Simplified Chinese updated. Closes: #473360 + * Catalan fixes. Closes: #387141 + * Typo fix in Greek translation. Closes: #479122 + * French updated. + * Thai updated. Closes: #479313 + * Italian updated. Closes: #479326 + * Polish updated. Closes: #479342 + * Bulgarian updated. Closes: #479379 + * Finnish updated. Closes: #479403 + * Korean updated. Closes: #479426 + * Basque updated. Closes: #479452 + * Vietnamese updated. Closes: #479748 + * Russian updated. Closes: #479777, #499029 + * Galician updated. Closes: #479792 + * Portuguese updated. Closes: #479847 + * Swedish updated. Closes: #479871 + * Dutch updated. Closes: #480125 + * Kurdish added. Closes: #480150 + * Brazilian Portuguese updated. Closes: #480561 + * Hungarian updated. Closes: #480662 + + [ Otavio Salvador ] + * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan + Donlan for the patch. Closes: #482476 + * Avoid using dbus if dbus-daemon isn't running. Closes: #438803 + + [ Michael Vogt ] + * debian/apt.cron.daily: + - apply patch based on the ideas of Francesco Poli for better + behavior when the cache can not be locked (closes: #459344) + + -- Michael Vogt Wed, 28 May 2008 15:19:12 +0200 + +apt (0.7.13) unstable; urgency=low + + [ Otavio Salvador ] + * Add missing build-depends back from build-depends-indep field. + Closes: #478231 + * Make cron script quiet if cache is locked. Thanks to Ted Percival + for the patch. Closes: #459344 + * Add timeout support for https. Thanks to Andrew Martens + for the patch. + + [ Goswin von Brederlow ] + * Add support for --no-download on apt-get update. Closes: #478517 + + [ Program translations ] + - Vietnamese updated. Closes: #479008 + + -- Otavio Salvador Fri, 02 May 2008 14:46:00 -0300 + +apt (0.7.12) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * apt-pkg/deb/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + * methods/connect.cc: + - remember hosts with Resolve failures or connect Timeouts + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard + * doc/apt_preferences.5.xml: + - fix typo + * added debian/README.source + + [ Christian Perrier ] + * Fix typos in manpages. Thanks to Daniel Leidert for the fixes + Closes: #444922 + * Fix syntax/copitalisation in some messages. Thanks to Jens Seidel + for pointing this and providing the patch. + Closes: #466845 + * Fix Polish offline translation. Thanks to Robert Luberda for the patch + and apologies for applying it very lately. Closes: #337758 + * Fix typo in offline.sgml. Closes: #412900 + + [ Program translations ] + - German updated. Closes: #466842 + - Swedish updated. + - Polish updated. Closes: #469581 + - Slovak updated. Closes: #471341 + - French updated. + - Bulgarian updated. Closes: #448492 + - Galician updated. Closes: #476839 + + [ Daniel Burrows ] + * apt-pkg/depcache.cc: + - Patch MarkInstall to follow currently satisfied Recommends even + if they aren't "new", so that we automatically force upgrades + when the version of a Recommends has been tightened. (Closes: #470115) + - Enable more complete debugging information when Debug::pkgAutoRemove + is set. + * apt-pkg/contrib/configuration.cc + - Lift the 1024-byte limit on lines in configuration files. + (Closes: #473710, #473874) + * apt-pkg/contrib/strutl.cc: + - Lift the 64000-byte limit on individual messages parsed by ReadMessages. + (Closes: #474065) + * debian/rules: + - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto. + + -- Daniel Burrows Sat, 26 Apr 2008 12:24:35 -0700 + +apt (0.7.11) unstable; urgency=critical + + [ Raise urgency to critical since it fixes a critical but for Debian + Installer Lenny Beta1 release ] + + [ Program translations ] + - Vietnamese updated. Closes: #460825 + - Basque updated. Closes: #461166 + - Galician updated. Closes: #461468 + - Portuguese updated. Closes: #464575 + - Korean updated. Closes: #448430 + - Simplified Chinese updated. Closes: #465866 + + [ Otavio Salvador ] + * Applied patch from Robert Millan to fix the error + message when gpgv isn't installed, closes: #452640. + * Fix regression about APT::Get::List-Cleanup setting being ignored, + closes: #466052. + + -- Otavio Salvador Thu, 17 Jan 2008 22:36:46 -0200 + +apt (0.7.10) unstable; urgency=low + + [ Otavio Salvador ] + * Applied patch from Mike O'Connor to add a manpage to + apt-mark, closes: #430207. + * Applied patch from Andrei Popescu to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + * Applied patch from Aurelien Jarno to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + * Fix compilation warnings in apt-pkg/cdrom.cc and + apt-pkg/contrib/configuration.cc. + * Fix typo in debian/copyright file ("licened" instead of "licensed"), + closes: #458966. + + [ Program translations ] + - Basque updated. Closes: #453088 + - Vietnamese updated. Closes: #453774, #459013 + - Japanese updated. Closes: #456909 + - Simplified Chinese updated. Closes: #458039 + - French updated. + - Norwegian Bokmål updated. Closes: #457917 + + [ Michael Vogt ] + * debian/rules + - fix https install location + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * apt-pkg/packagemanager.{cc,h}: + - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thanks to Michael Gilbert + for the patch. Closes: #260825 + + -- Michael Vogt Mon, 07 Jan 2008 21:40:47 +0100 + +apt (0.7.9) unstable; urgency=low + + [ Christian Perrier ] + * Add several languages to LINGUAS and, therefore, really ship the relevant + translation: + Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai + Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321 + + [ Program translations ] + - Korean updated. Closes: #448430 + - Galician updated. Closes: #448497 + - Swedish updated. + + [ Otavio Salvador ] + * Fix configure script to check for CURL library and headers presense. + * Applied patch from Brian M. Carlson + to add backward support for arches that lacks pselect support, + closes: #448406. + * Umount CD-ROM when calling apt-cdrom ident, except when called with + -m, closes: #448521. + -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 + +apt (0.7.8) unstable; urgency=low + + * Applied patch from Daniel Leidert to fix + APT::Acquire::Translation "none" support, closes: #437523. + * Applied patch from Daniel Burrows to add support + for the Homepage field (ABI break), closes: #447970. + * Applied patch from Frans Pop to fix a trailing + space after cd label, closes: #448187. + + -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 + +apt (0.7.7) unstable; urgency=low + + [ Michael Vogt ] + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have a file + - send range request with if-range + - delete failed downloads + - delete zero size I-M-S hits + * apt-pkg/deb/dpkgpm.{cc,h}: + - merged dpkg-log branch, this lets you specify a + Dir::Log::Terminal file to log dpkg output to + (ABI break) + - fix parse error when dpkg sends unexpected data + * merged apt--sha256 branch to fully support the new + sha256 checksums in the Packages and Release files + (ABI break) + * apt-pkg/pkgcachegen.cc: + - increase default mmap size + * tests/local-repo: + - added local repository testcase + * apt-pkg/acquire.cc: + - increase MaxPipeDepth for the internal worker<->method + communication to 1000 for the debtorrent backend + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled + * apt-pkg/acquire-item.cc: + - fix crash in diff acquire code + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + * apt-pkg/depcache.cc: + - set "APT::Install-Recommends" to true by default (OMG!) + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Program translations ] + - French updated + - Basque updated. Closes: #436425 + - Fix the zh_CN translator's name in debian/changelog for 0.7.2 + Closes: #423272 + - Vietnamese updated. Closes: #440611 + - Danish updated. Closes: #441102 + - Thai added. Closes: #442833 + - Swedish updated. + - Galician updated. Closes: #446626 + + [ Otavio Salvador ] + * Add hash support to copy method. Thanks Anders Kaseorg by the patch + (closes: #436055) + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray for the patch (closes: #437150) + * Add support to apt-key to export keys to stdout. Thanks to "Dwayne + C. Litzenberger" for the patch (closes: #441942) + * Fix compilation warnings: + - apt-pkg/indexfile.cc: conversion from string constant to 'char*'; + - apt-pkg/acquire-item.cc: likewise; + - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument + has type 'size_t'; + - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from + string constant to 'char*'; + - methods/gpgv.cc: conversion from string constant to 'char*'; + - methods/ftp.cc: likewise; + - cmdline/apt-extracttemplates.cc: likewise; + - apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; + * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage + statement of apt-get (closes: #445468). + * cmdline/apt-get.cc: really applies Julien Danjou + patch to add 'purge' command line argument (closes: #133421). + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + [ Colin Watson ] + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 + + -- Michael Vogt Tue, 23 Oct 2007 14:58:03 +0200 + +apt (0.7.6) unstable; urgency=low + + * Applied patch from Aurelien Jarno to fix wrong + directory downloading on non-linux architectures (closes: #435597) + + -- Otavio Salvador Wed, 01 Aug 2007 19:49:51 -0300 + +apt (0.7.6) unstable; urgency=low + + * Applied patch from Aurelien Jarno to fix wrong + directory downloading on non-linux architectures (closes: #435597) + + -- Otavio Salvador Wed, 01 Aug 2007 19:49:51 -0300 + +apt (0.7.5) unstable; urgency=low + + [ Otavio Salvador ] + * Applied patch from Guillem Jover to use + dpkg-architecture to get the host architecture (closes: #407187) + * Applied patch from Guillem Jover to add + support to add lzma support (closes: #408201) + + [ Michael Vogt ] + * apt-pkg/depcache.cc: + - support a list of sections for: + APT::Install-Recommends-Sections + APT::Never-MarkAuto-Sections + * methods/makefile: + - install lzma symlink method (for full lzma support) + * debian/control: + - suggest "lzma" + + -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 + +apt (0.7.4) unstable; urgency=low + + [ Michael Vogt ] + * cmdline/apt-get.cc: + - fix in the task-install code regexp (thanks to Adam Conrad and + Colin Watson) + - support task removal too: apt-get remove taskname^ + (thanks to Matt Zimmerman reporting this problem) + + [ Otavio Salvador ] + * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + * Fix compilation warnings: + - apt-pkg/contrib/configuration.cc: wrong argument type; + - apt-pkg/deb/dpkgpm.cc: wrong signess; + - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; + - methods/https.cc: + - type conversion; + - unused variable; + - changed SetupProxy() method to void; + * Simplified HttpMethod::Fetch on http.cc removing Tail variable; + * Fix pipeline handling on http.cc (closes: #413324) + * Fix building to properly support binNMUs. Thanks to Daniel Schepler + by the patch (closes: #359634) + * Fix example for Install-{Recommends,Suggests} options on + configure-index example file. Thanks to Peter Eisentraut + by the patch (closes: #432223) + + [ Christian Perrier ] + * Basque translation update. Closes: ##423766 + * Unfuzzy formerly complete translations + * French translation update + * Re-generate PO(T) files + * Spanish translation update + * Swedish translation update + + -- Otavio Salvador Tue, 24 Jul 2007 09:55:50 -0300 + +apt (0.7.3) unstable; urgency=low + + * fixed compile errors with g++ 4.3 (thanks to + Daniel Burrows, closes: #429378) + * fixes in the auto-mark code (thanks to Daniel + Burrows) + * fix FTBFS by changing build-depends to + libcurl4-gnutls-dev (closes: #428363) + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) + * merged from Christian Perrier: + * vi.po: completed to 532t, again. Closes: #429899 + * gl.po: completed to 532t. Closes: #429506 + * vi.po: completed to 532t. Closes: #428672 + * Update all PO and the POT. Gives 514t14f4u for formerly + complete translations + * fr.po: completed to 532t + * ku.po, uk.po, LINGUAS: reintegrate those translations + which disappeared from the BZR repositories + + -- Michael Vogt Sun, 01 Jul 2007 12:31:29 +0200 + +apt (0.7.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libcurl4-gnutls-dev instead of the obsolete + libcurl3-gnutls-dev. Closes: #428363. + + -- Steve Langasek Thu, 28 Jun 2007 18:46:53 -0700 + +apt (0.7.2) unstable; urgency=low + + * merged the debian/experimental changes back + into the debian/sid branch + * merged from Christian Perrier: + * mr.po: New Marathi translation Closes: #416806 + * zh_CN.po: Updated by Kov Chai Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections + * buildlib/archtable: + - added support for sh3/sh4 (closes: #424870) + - added support for m32r (closes: #394096) + * buildlib/systemtable: + - added support for lpia + * configure.in: + - check systemtable for architecture mapping too + * fix error in AutocleanInterval, closes: #319339 + (thanks to Israel G. Lugo for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) + * fix FTBFS with gcc 4.3, closes: #417090 + (thanks to Martin Michlmayr for the patch) + * add --dsc-only option, thanks to K. Richard Pixley + * Removed the more leftover #pragma interface/implementation + closes: #306937 (thanks to Andreas Henriksson for the patch) + + -- Michael Vogt Wed, 06 Jun 2007 23:19:50 +0200 + +apt (0.7.1) experimental; urgency=low + + * ABI library name change because it's built against + new glibc + * implement SourceVer() in pkgRecords + (thanks to Daniel Burrows for the patch!) + * apt-pkg/algorithm.cc: + - use clog for all debugging + - only increase the score of installed applications if they + are not obsolete + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + * methods/cdrom.cc: + - only umount if it was mounted by the method before + * po/gl.po: + - fix error translation that causes trouble to lsb_release + * apt-pkg/acquire-item.cc: + - if decompression of a index fails, delete the index + * apt-pkg/acquire.{cc,h}: + - deal better with duplicated sources.list entries (avoid + double queuing of URLs) - this fixes hangs in bzip/gzip + * merged from Christian Perrier: + * mr.po: New Marathi translation Closes: #416806 + * zh_CN.po: Updated by Eric Pareja Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections + * vi.po: Updated to 515t. Closes: #426976 + * eu.po: Updated to 515t. Closes: #423766 + * pt.po: 515t. Closes: #423111 + * fr.po: Updated by Christian Perrier + * Update all PO and the POT. Gives 513t2f for formerly + complete translations + * apt-pkg/policy.cc: + - allow multiple packages (thanks to David Foerster) + + -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + +apt (0.7.0) experimental; urgency=low + + * Package that contains all the new features + * Removed all #pragma interface/implementation + * Branch that contains all the new features: + * translated package descriptions + * task install support + * automatic dependency removal (thanks to Daniel Burrows) + * merged support for the new dpkg "Breaks" field + (thanks to Ian Jackson) + * handle network failures more gracefully on "update" + * support for unattended-upgrades (via unattended-upgrades + package) + * added apt-transport-https method + * merged "install-recommends" branch (ABI break): + - new "--install-recommends" + - install new recommends on "upgrade" if --install-recommends is + given + - new "--fix-policy" option to install all packages with unmet + important dependencies (usefull with --install-recommends to + see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + * merged "install-task" branch (use with "apt-get install taskname^") + + -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 + +apt (0.6.46.4-0.1) unstable; urgency=emergency + * NMU * Fix broken use of awk in apt-key that caused removal of the wrong keys from the keyring. Closes: #412572 @@ -87,7 +1020,7 @@ apt (0.6.46.1) unstable; urgency=low * methods/gzip.cc: - deal with empty files - * Applied patch from Daniel Schepler to make apt bin-NMU able. + * Applied patch from Daniel Schepler to make apt bin-NMU able. (closes: bug#359634) * rebuild against current g++ because of: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 @@ -175,26 +1108,42 @@ apt (0.6.45) unstable; urgency=low * dz.po: New Dzongkha translation: 512t * ro.po: Updated to 512t * eu.po: Updated + * eu.po: Updated + * fix apt-get dist-upgrade + * fix warning if no /var/lib/apt/extended_states is present + * don't download Translations for deb-src sources.list lines + * apt-pkg/tagfile.cc: + - support not-mmapable files again -- Michael Vogt Thu, 27 Jul 2006 00:52:05 +0200 -apt (0.6.44.2) unstable; urgency=low - - * apt-pkg/depcache.cc: - - added Debug::pkgDepCache::AutoInstall (thanks to infinity) - * apt-pkg/acquire-item.cc: - - fix missing chmod() in the new aquire code - (thanks to Bastian Blank, Closes: #367425) - * merged from - http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations - - -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 +apt (0.6.44.2exp1) experimental; urgency=low + + * added support for i18n of the package descriptions + * added support for aptitude like auto-install tracking (a HUGE + HUGE thanks to Daniel Burrows who made this possible) + * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch + * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental + + -- Michael Vogt Mon, 3 Jul 2006 21:50:31 +0200 + +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + + -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low @@ -426,7 +1375,7 @@ apt (0.6.42) unstable; urgency=low * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) - + -- Michael Vogt Wed, 19 Oct 2005 22:02:09 +0200 apt (0.6.41) unstable; urgency=low @@ -526,6 +1475,7 @@ apt (0.6.37) breezy; urgency=low * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) * Change debian/bugscript to use #!/bin/bash (Closes: #313402) + * Fix a incorrect example in the man-page (closes: #282918) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 @@ -2373,4 +3323,3 @@ apt (0.0.1) unstable; urgency=low * Initial Release. -- Scott K. Ellis Tue, 31 Mar 1998 12:49:28 -0500 - diff --git a/debian/control b/debian/control index f331a84..ba9e32e 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,12 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt -Standards-Version: 3.6.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12) -Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +Uploaders: Michael Vogt , Otavio Salvador , + Christian Perrier , Daniel Burrows , + Luca Bruno , Eugene V. Lyubimkin +Standards-Version: 3.8.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/ Package: apt Architecture: any @@ -13,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2 +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@ -35,7 +37,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${Source-Version}), apt-utils (= ${Source-Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -64,3 +66,12 @@ Description: APT utility programs apt-extracttemplates is used by debconf to prompt for configuration questions before installation. apt-ftparchive is used to create Package and other index files. apt-sortpkgs is a Package/Source file normalizer. + +Package: apt-transport-https +Architecture: any +Depends: ${shlibs:Depends} +Priority: optional +Section: admin +Description: APT https transport + This package contains a APT https transport. It makes it possible to + use 'deb https://foo distro main' lines in the sources.list. diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index 59558de..4b47db8 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -8,7 +8,7 @@ Abstract: The APT Cache Specification describes the complete implementation tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/cache.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech index 3afc262..055e8e6 100644 --- a/debian/libapt-pkg-doc.doc-base.dpkg-tech +++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech @@ -3,7 +3,7 @@ Title: APT's interpetation of DPkg Technical Specification Author: Jason Gunthorpe Abstract: The DPkg Technical Manual gives an overview of dpkg's external functions(as APT sees them) and describes how it views the world. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.files b/debian/libapt-pkg-doc.doc-base.files index e0b7935..a9faec0 100644 --- a/debian/libapt-pkg-doc.doc-base.files +++ b/debian/libapt-pkg-doc.doc-base.files @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Files document describes the complete implementation and format of the installed APT directory structure. It also serves as guide to how APT views the Debian archive. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/files.html/index.html diff --git a/debian/libapt-pkg-doc.doc-base.method b/debian/libapt-pkg-doc.doc-base.method index 61c3612..f40d875 100644 --- a/debian/libapt-pkg-doc.doc-base.method +++ b/debian/libapt-pkg-doc.doc-base.method @@ -3,7 +3,7 @@ Title: APT Method Interface Author: Jason Gunthorpe Abstract: The APT Method Interface document describes the interface that APT uses to the archive access methods. -Section: Devel +Section: Debian Format: html Index: /usr/share/doc/libapt-pkg-doc/method.html/index.html diff --git a/debian/postrm b/debian/postrm index 8b921dd..ae1e18d 100755 --- a/debian/postrm +++ b/debian/postrm @@ -8,6 +8,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +set -e + #DEBHELPER# case "$1" in diff --git a/debian/preinst b/debian/preinst index 276eae5..985ad9b 100755 --- a/debian/preinst +++ b/debian/preinst @@ -1,5 +1,7 @@ #! /bin/sh +set -e + # dpkg does this for us while we are upgrading.. #if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then # rm /var/state/apt diff --git a/debian/prerm b/debian/prerm index ac70a02..4a8d477 100755 --- a/debian/prerm +++ b/debian/prerm @@ -1,5 +1,7 @@ #! /bin/sh +set -e + #DEBHELPER# if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && diff --git a/debian/rules b/debian/rules index 02ee734..f1eb62b 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') +APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') @@ -125,8 +125,8 @@ build/build-doc-stamp: build/configure-stamp clean: dh_testdir # dh_testroot - -$(MAKE) clean - -$(MAKE) distclean + [ -f Makefile ] && $(MAKE) clean + [ -f Makefile ] && $(MAKE) distclean rm -rf build @@ -185,8 +185,8 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils -apt: build debian/shlibs.local +binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https +apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k @@ -204,16 +204,27 @@ apt: build debian/shlibs.local find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \; cp $(BLD)/bin/methods/* debian/$@/usr/lib/apt/methods/ + # https has its own package + rm debian/$@/usr/lib/apt/methods/https cp $(BLD)/scripts/dselect/* debian/$@/usr/lib/dpkg/methods/apt/ cp -r $(BLD)/locale debian/$@/usr/share/ cp debian/bugscript debian/$@/usr/share/bug/apt/script + cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog + # copy lintian override + cp share/lintian-overrides debian/$@/usr/share/lintian/overrides/apt + + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ @@ -286,6 +297,32 @@ apt-utils: build debian/shlibs.local dh_md5sums -p$@ dh_builddeb -p$@ +apt-transport-https: build debian/shlibs.local libapt-pkg-dev + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k + dh_installdirs -p$@ + + # install the method + mkdir -p debian/$@/usr/lib/apt/methods + cp $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods + + dh_installdocs -p$@ debian/apt-transport-https.README + dh_installexamples -p$@ + + # Install the man pages.. + dh_installman -p$@ + + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false @@ -338,4 +375,4 @@ arch-build: mkdir -p debian/arch-build/apt-$(APT_DEBVER) tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 94d80ad..0000000 --- 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/Doxyfile.in b/doc/Doxyfile.in new file mode 100644 index 0000000..f19ff93 --- /dev/null +++ b/doc/Doxyfile.in @@ -0,0 +1,1238 @@ +# Doxyfile 1.4.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = @PACKAGE@ + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = ../build/doc/doxygen + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, +# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, +# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, +# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). + +USE_WINDOWS_ENCODING = NO + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = YES + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is YES. + +SHOW_DIRECTORIES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../apt-pkg + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +FILE_PATTERNS = *.cc \ + *.h + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = @HAVE_DOT@ + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = @DOTDIR@ + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that a graph may be further truncated if the graph's +# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH +# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), +# the graph is not depth-constrained. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/doc/apt-cache.8 b/doc/apt-cache.8 deleted file mode 100644 index 0b2c414..0000000 --- a/doc/apt-cache.8 +++ /dev/null @@ -1,377 +0,0 @@ -.\" Title: apt\-cache -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-CACHE" "8" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-cache \- APT package handling utility \-\- cache manipulator -.SH "SYNOPSIS" -.HP 10 -\fBapt\-cache\fR [\fB\-hvsn\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[add\ \fIfile\fR...] | [gencaches] | [showpkg\ \fIpkg\fR...] | [showsrc\ \fIpkg\fR...] | [stats] | [dump] | [dumpavail] | [unmet] | [search\ \fIregex\fR] | [show\ \fIpkg\fR...] | [depends\ \fIpkg\fR...] | [rdepends\ \fIpkg\fR...] | [pkgnames\ \fIprefix\fR] | [dotty\ \fIpkg\fR...] | [policy\ \fIpkgs\fR...] | [madison\ \fIpkgs\fR...]} -.SH "DESCRIPTION" -.PP -\fBapt\-cache\fR -performs a variety of operations on APT's package cache. -\fBapt\-cache\fR -does not manipulate the state of the system but does provide operations to search and generate interesting output from the package metadata. -.PP -Unless the -\fB\-h\fR, or -\fB\-\-help\fR -option is given, one of the commands below must be present. -.PP -add \fIfile(s)\fR -.RS 3n -add -adds the named package index files to the package cache. This is for debugging only. -.RE -.PP -gencaches -.RS 3n -gencaches -performs the same operation as -\fBapt\-get check\fR. It builds the source and package caches from the sources in -\fBsources.list\fR(5) -and from -\fI/var/lib/dpkg/status\fR. -.RE -.PP -showpkg \fIpkg(s)\fR -.RS 3n -showpkg -displays information about the packages listed on the command line. Remaining arguments are package names. The available versions and reverse dependencies of each package listed are listed, as well as forward dependencies for each version. Forward (normal) dependencies are those packages upon which the package in question depends; reverse dependencies are those packages that depend upon the package in question. Thus, forward dependencies must be satisfied for a package, but reverse dependencies need not be. For instance, -\fBapt\-cache showpkg libreadline2\fR -would produce output similar to the following: -.sp -.RS 3n -.nf -Package: libreadline2 -Versions: 2.1\-12(/var/state/apt/lists/foo_Packages), -Reverse Depends: - libreadlineg2,libreadline2 - libreadline2\-altdev,libreadline2 -Dependencies: -2.1\-12 \- libc5 (2 5.4.0\-0) ncurses3.0 (0 (null)) -Provides: -2.1\-12 \- -Reverse Provides: -.fi -.RE -Thus it may be seen that libreadline2, version 2.1\-12, depends on libc5 and ncurses3.0 which must be installed for libreadline2 to work. In turn, libreadlineg2 and libreadline2\-altdev depend on libreadline2. If libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be installed; libreadlineg2 and libreadline2\-altdev do not have to be installed. For the specific meaning of the remainder of the output it is best to consult the apt source code. -.RE -.PP -stats -.RS 3n -stats -displays some statistics about the cache. No further arguments are expected. Statistics reported are: -.RS 3n -.TP 3n -\(bu -Total package names -is the number of package names found in the cache. -.TP 3n -\(bu -Normal packages -is the number of regular, ordinary package names; these are packages that bear a one\-to\-one correspondence between their names and the names used by other packages for them in dependencies. The majority of packages fall into this category. -.TP 3n -\(bu -Pure virtual packages -is the number of packages that exist only as a virtual package name; that is, packages only "provide" the virtual package name, and no package actually uses the name. For instance, "mail\-transport\-agent" in the Debian GNU/Linux system is a pure virtual package; several packages provide "mail\-transport\-agent", but there is no package named "mail\-transport\-agent". -.TP 3n -\(bu -Single virtual packages -is the number of packages with only one package providing a particular virtual package. For example, in the Debian GNU/Linux system, "X11\-text\-viewer" is a virtual package, but only one package, xless, provides "X11\-text\-viewer". -.TP 3n -\(bu -Mixed virtual packages -is the number of packages that either provide a particular virtual package or have the virtual package name as the package name. For instance, in the Debian GNU/Linux system, "debconf" is both an actual package, and provided by the debconf\-tiny package. -.TP 3n -\(bu -Missing -is the number of package names that were referenced in a dependency but were not provided by any package. Missing packages may be in evidence if a full distribution is not accessed, or if a package (real or virtual) has been dropped from the distribution. Usually they are referenced from Conflicts statements. -.TP 3n -\(bu -Total distinct -versions is the number of package versions found in the cache; this value is therefore at least equal to the number of total package names. If more than one distribution (both "stable" and "unstable", for instance), is being accessed, this value can be considerably larger than the number of total package names. -.TP 3n -\(bu -Total dependencies -is the number of dependency relationships claimed by all of the packages in the cache. -.RE -.IP "" 3n -.RE -.PP -showsrc \fIpkg(s)\fR -.RS 3n -showsrc -displays all the source package records that match the given package names. All versions are shown, as well as all records that declare the name to be a Binary. -.RE -.PP -dump -.RS 3n -dump -shows a short listing of every package in the cache. It is primarily for debugging. -.RE -.PP -dumpavail -.RS 3n -dumpavail -prints out an available list to stdout. This is suitable for use with -\fBdpkg\fR(8) -and is used by the -\fBdselect\fR(8) -method. -.RE -.PP -unmet -.RS 3n -unmet -displays a summary of all unmet dependencies in the package cache. -.RE -.PP -show \fIpkg(s)\fR -.RS 3n -show -performs a function similar to -\fBdpkg \-\-print\-avail\fR; it displays the package records for the named packages. -.RE -.PP -search \fIregex [ regex ... ]\fR -.RS 3n -search -performs a full text search on all available package lists for the regex pattern given. It searches the package names and the descriptions for an occurrence of the regular expression and prints out the package name and the short description. If -\fB\-\-full\fR -is given then output identical to -show -is produced for each matched package, and if -\fB\-\-names\-only\fR -is given then the long description is not searched, only the package name is. -.sp -Separate arguments can be used to specify multiple search patterns that are and'ed together. -.RE -.PP -depends \fIpkg(s)\fR -.RS 3n -depends -shows a listing of each dependency a package has and all the possible other packages that can fulfill that dependency. -.RE -.PP -rdepends \fIpkg(s)\fR -.RS 3n -rdepends -shows a listing of each reverse dependency a package has. -.RE -.PP -pkgnames \fI[ prefix ]\fR -.RS 3n -This command prints the name of each package in the system. The optional argument is a prefix match to filter the name list. The output is suitable for use in a shell tab complete function and the output is generated extremely quickly. This command is best used with the -\fB\-\-generate\fR -option. -.RE -.PP -dotty \fIpkg(s)\fR -.RS 3n -dotty -takes a list of packages on the command line and generates output suitable for use by dotty from the -[1]\&\fIGraphViz\fR -package. The result will be a set of nodes and edges representing the relationships between the packages. By default the given packages will trace out all dependent packages; this can produce a very large graph. To limit the output to only the packages listed on the command line, set the -APT::Cache::GivenOnly -option. -.sp -The resulting nodes will have several shapes; normal packages are boxes, pure provides are triangles, mixed provides are diamonds, missing packages are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue lines are pre\-depends, green lines are conflicts. -.sp -Caution, dotty cannot graph larger sets of packages. -.RE -.PP -policy \fI[ pkg(s) ]\fR -.RS 3n -policy -is meant to help debug issues relating to the preferences file. With no arguments it will print out the priorities of each source. Otherwise it prints out detailed information about the priority selection of the named package. -.RE -.PP -madison \fI/[ pkg(s) ]\fR -.RS 3n -apt\-cache's -madison -command attempts to mimic the output format and a subset of the functionality of the Debian archive management tool, -madison. It displays available versions of a package in a tabular format. Unlike the original -madison, it can only display information for the architecture for which APT has retrieved package lists (APT::Architecture). -.RE -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-p\fR, \fB\-\-pkg\-cache\fR -.RS 3n -Select the file to store the package cache. The package cache is the primary cache used by all operations. Configuration Item: -Dir::Cache::pkgcache. -.RE -.PP -\fB\-s\fR, \fB\-\-src\-cache\fR -.RS 3n -Select the file to store the source cache. The source is used only by -gencaches -and it stores a parsed version of the package information from remote sources. When building the package cache the source cache is used to avoid reparsing all of the package files. Configuration Item: -Dir::Cache::srcpkgcache. -.RE -.PP -\fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Quiet; produces output suitable for logging, omitting progress indicators. More q's will produce more quietness up to a maximum of 2. You can also use -\fB\-q=#\fR -to set the quietness level, overriding the configuration file. Configuration Item: -quiet. -.RE -.PP -\fB\-i\fR, \fB\-\-important\fR -.RS 3n -Print only important dependencies; for use with unmet. Causes only Depends and Pre\-Depends relations to be printed. Configuration Item: -APT::Cache::Important. -.RE -.PP -\fB\-f\fR, \fB\-\-full\fR -.RS 3n -Print full package records when searching. Configuration Item: -APT::Cache::ShowFull. -.RE -.PP -\fB\-a\fR, \fB\-\-all\-versions\fR -.RS 3n -Print full records for all available versions. This is the default; to turn it off, use -\fB\-\-no\-all\-versions\fR. If -\fB\-\-no\-all\-versions\fR -is specified, only the candidate version will displayed (the one which would be selected for installation). This option is only applicable to the -show -command. Configuration Item: -APT::Cache::AllVersions. -.RE -.PP -\fB\-g\fR, \fB\-\-generate\fR -.RS 3n -Perform automatic package cache regeneration, rather than use the cache as it is. This is the default; to turn it off, use -\fB\-\-no\-generate\fR. Configuration Item: -APT::Cache::Generate. -.RE -.PP -\fB\-\-names\-only\fR, \fB\-n\fR -.RS 3n -Only search on the package names, not the long descriptions. Configuration Item: -APT::Cache::NamesOnly. -.RE -.PP -\fB\-\-all\-names\fR -.RS 3n -Make -pkgnames -print all names, including virtual packages and missing dependencies. Configuration Item: -APT::Cache::AllNames. -.RE -.PP -\fB\-\-recurse\fR -.RS 3n -Make -depends -and -rdepends -recursive so that all packages mentioned are printed once. Configuration Item: -APT::Cache::RecurseDepends. -.RE -.PP -\fB\-\-installed\fR -.RS 3n -Limit the output of -depends -and -rdepends -to packages which are currently installed. Configuration Item: -APT::Cache::Installed. -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "FILES" -.PP -\fI/etc/apt/sources.list\fR -.RS 3n -Locations to fetch packages from. Configuration Item: -Dir::Etc::SourceList. -.RE -.PP -\fI/var/lib/apt/lists/\fR -.RS 3n -Storage area for state information for each package resource specified in -\fBsources.list\fR(5) -Configuration Item: -Dir::State::Lists. -.RE -.PP -\fI/var/lib/apt/lists/partial/\fR -.RS 3n -Storage area for state information in transit. Configuration Item: -Dir::State::Lists -(implicit partial). -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5), -\fBsources.list\fR(5), -\fBapt\-get\fR(8) -.SH "DIAGNOSTICS" -.PP -\fBapt\-cache\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[2]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ GraphViz -\%http://www.research.att.com/sw/tools/graphviz/ -.TP 3 -2.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 2779f25..21605ff 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -51,6 +51,7 @@ rdepends pkg pkgnames prefix dotty pkg + xvcg pkg policy pkgs madison pkgs @@ -151,7 +152,7 @@ Reverse Provides: a dependency but were not provided by any package. Missing packages may be in evidence if a full distribution is not accessed, or if a package (real or virtual) has been dropped from the distribution. Usually they - are referenced from Conflicts statements. + are referenced from Conflicts or Breaks statements. Total distinct versions is the number of package versions @@ -197,9 +198,14 @@ Reverse Provides: search regex [ regex ... ] search performs a full text search on all available package - lists for the regex pattern given. It searches the package names and the + lists for the POSIX regex pattern given, see + regex + 7. + It searches the package names and the descriptions for an occurrence of the regular expression and prints out - the package name and the short description. If is given + the package name and the short description, including virtual package + names. + If is given then output identical to show is produced for each matched package, and if is given then the long description is not searched, only the package name is. @@ -244,6 +250,11 @@ Reverse Provides: Caution, dotty cannot graph larger sets of packages. + xvcg pkg(s) + The same as dotty, only for xvcg from the + VCG tool. + + policy [ pkg(s) ] policy is meant to help debug issues relating to the preferences file. With no arguments it will print out the diff --git a/doc/apt-cdrom.8 b/doc/apt-cdrom.8 deleted file mode 100644 index 6330cde..0000000 --- a/doc/apt-cdrom.8 +++ /dev/null @@ -1,153 +0,0 @@ -.\" Title: apt\-cdrom -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 14 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-CDROM" "8" "14 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-cdrom \- APT CDROM management utility -.SH "SYNOPSIS" -.HP 10 -\fBapt\-cdrom\fR [\fB\-hvrmfan\fR] [\fB\-d=\fR\fB\fIcdrom\ mount\ point\fR\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] [[add] | [ident]] -.SH "DESCRIPTION" -.PP -\fBapt\-cdrom\fR -is used to add a new CDROM to APTs list of available sources. -\fBapt\-cdrom\fR -takes care of determining the structure of the disc as well as correcting for several possible mis\-burns and verifying the index files. -.PP -It is necessary to use -\fBapt\-cdrom\fR -to add CDs to the APT system, it cannot be done by hand. Furthermore each disk in a multi\-cd set must be inserted and scanned separately to account for possible mis\-burns. -.PP -Unless the -\fB\-h\fR, or -\fB\-\-help\fR -option is given one of the commands below must be present. -.PP -add -.RS 3n -add -is used to add a new disc to the source list. It will unmount the CDROM device, prompt for a disk to be inserted and then procceed to scan it and copy the index files. If the disc does not have a proper -\fIdisk\fR -directory you will be prompted for a descriptive title. -.sp -APT uses a CDROM ID to track which disc is currently in the drive and maintains a database of these IDs in -\fI/var/lib/apt/cdroms.list\fR -.RE -.PP -ident -.RS 3n -A debugging tool to report the identity of the current disc as well as the stored file name -.RE -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-d\fR, \fB\-\-cdrom\fR -.RS 3n -Mount point; specify the location to mount the cdrom. This mount point must be listed in -\fI/etc/fstab\fR -and properly configured. Configuration Item: -Acquire::cdrom::mount. -.RE -.PP -\fB\-r\fR, \fB\-\-rename\fR -.RS 3n -Rename a disc; change the label of a disk or override the disks given label. This option will cause -\fBapt\-cdrom\fR -to prompt for a new label. Configuration Item: -APT::CDROM::Rename. -.RE -.PP -\fB\-m\fR, \fB\-\-no\-mount\fR -.RS 3n -No mounting; prevent -\fBapt\-cdrom\fR -from mounting and unmounting the mount point. Configuration Item: -APT::CDROM::NoMount. -.RE -.PP -\fB\-f\fR, \fB\-\-fast\fR -.RS 3n -Fast Copy; Assume the package files are valid and do not check every package. This option should be used only if -\fBapt\-cdrom\fR -has been run on this disc before and did not detect any errors. Configuration Item: -APT::CDROM::Fast. -.RE -.PP -\fB\-a\fR, \fB\-\-thorough\fR -.RS 3n -Thorough Package Scan; This option may be needed with some old Debian 1.1/1.2 discs that have Package files in strange places. It takes much longer to scan the CD but will pick them all up. -.RE -.PP -\fB\-n\fR, \fB\-\-just\-print\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -No Changes; Do not change the -\fBsources.list\fR(5) -file and do not write index files. Everything is still checked however. Configuration Item: -APT::CDROM::NoAct. -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5), -\fBapt\-get\fR(8), -\fBsources.list\fR(5) -.SH "DIAGNOSTICS" -.PP -\fBapt\-cdrom\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-config.8 b/doc/apt-config.8 deleted file mode 100644 index 4464b32..0000000 --- a/doc/apt-config.8 +++ /dev/null @@ -1,108 +0,0 @@ -.\" Title: apt\-config -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-CONFIG" "8" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-config \- APT Configuration Query program -.SH "SYNOPSIS" -.HP 11 -\fBapt\-config\fR [\fB\-hv\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[shell] | [dump]} -.SH "DESCRIPTION" -.PP -\fBapt\-config\fR -is an internal program used by various portions of the APT suite to provide consistent configurability. It accesses the main configuration file -\fI/etc/apt/apt.conf\fR -in a manner that is easy to use by scripted applications. -.PP -Unless the -\fB\-h\fR, or -\fB\-\-help\fR -option is given one of the commands below must be present. -.PP -shell -.RS 3n -shell is used to access the configuration information from a shell script. It is given pairs of arguments, the first being a shell variable and the second the configuration value to query. As output it lists a series of shell assignments commands for each present value. In a shell script it should be used like: -.sp -.RS 3n -.nf -OPTS="\-f" -RES=`apt\-config shell OPTS MyApp::options` -eval $RES -.fi -.RE -This will set the shell environment variable $OPTS to the value of MyApp::options with a default of -\fB\-f\fR. -.sp -The configuration item may be postfixed with a /[fdbi]. f returns file names, d returns directories, b returns true or false and i returns an integer. Each of the returns is normalized and verified internally. -.RE -.PP -dump -.RS 3n -Just show the contents of the configuration space. -.RE -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5) -.SH "DIAGNOSTICS" -.PP -\fBapt\-config\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-extracttemplates.1 b/doc/apt-extracttemplates.1 deleted file mode 100644 index c13daa8..0000000 --- a/doc/apt-extracttemplates.1 +++ /dev/null @@ -1,92 +0,0 @@ -.\" Title: apt\-extracttemplates -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-EXTRACTTEMPLATES" "1" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-extracttemplates \- Utility to extract DebConf config and templates from Debian packages -.SH "SYNOPSIS" -.HP 21 -\fBapt\-extracttemplates\fR [\fB\-hv\fR] [\fB\-t=\fR\fB\fItemporary\ directory\fR\fR] \fIfile\fR... -.SH "DESCRIPTION" -.PP -\fBapt\-extracttemplates\fR -will take one or more Debian package files as input and write out (to a temporary directory) all associated config scripts and template files. For each passed in package that contains config scripts and templates, one line of output will be generated in the format: -.PP -package version template\-file config\-script -.PP -template\-file and config\-script are written to the temporary directory specified by the \-t or \-\-tempdir (APT::ExtractTemplates::TempDir) directory, with filenames of the form -\fIpackage.template.XXXX\fR -and -\fIpackage.config.XXXX\fR -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-t\fR, \fB\-\-tempdir\fR -.RS 3n -Temporary directory in which to write extracted debconf template files and config scripts Configuration Item: -APT::ExtractTemplates::TempDir -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5) -.SH "DIAGNOSTICS" -.PP -\fBapt\-extracttemplates\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-ftparchive.1 b/doc/apt-ftparchive.1 deleted file mode 100644 index ee9f76b..0000000 --- a/doc/apt-ftparchive.1 +++ /dev/null @@ -1,534 +0,0 @@ -.\" Title: apt\-ftparchive -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-FTPARCHIVE" "1" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-ftparchive \- Utility to generate index files -.SH "SYNOPSIS" -.HP 15 -\fBapt\-ftparchive\fR [\fB\-hvdsq\fR] [\fB\-\-md5\fR] [\fB\-\-delink\fR] [\fB\-\-readonly\fR] [\fB\-\-contents\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[packages\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [sources\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [contents\ \fIpath\fR] | [release\ \fIpath\fR] | [generate\ \fIconfig\-file\fR\ \fIsection\fR...] | [clean\ \fIconfig\-file\fR]} -.SH "DESCRIPTION" -.PP -\fBapt\-ftparchive\fR -is the command line tool that generates the index files that APT uses to access a distribution source. The index files should be generated on the origin site based on the content of that site. -.PP -\fBapt\-ftparchive\fR -is a superset of the -\fBdpkg\-scanpackages\fR(8) -program, incorporating its entire functionality via the -packages -command. It also contains a contents file generator, -contents, and an elaborate means to 'script' the generation process for a complete archive. -.PP -Internally -\fBapt\-ftparchive\fR -can make use of binary databases to cache the contents of a .deb file and it does not rely on any external programs aside from -\fBgzip\fR(1). When doing a full generate it automatically performs file\-change checks and builds the desired compressed output files. -.PP -Unless the -\fB\-h\fR, or -\fB\-\-help\fR -option is given one of the commands below must be present. -.PP -packages -.RS 3n -The packages command generates a package file from a directory tree. It takes the given directory and recursively searches it for .deb files, emitting a package record to stdout for each. This command is approximately equivalent to -\fBdpkg\-scanpackages\fR(8). -.sp -The option -\fB\-\-db\fR -can be used to specify a binary caching DB. -.RE -.PP -sources -.RS 3n -The -sources -command generates a source index file from a directory tree. It takes the given directory and recursively searches it for .dsc files, emitting a source record to stdout for each. This command is approximately equivalent to -\fBdpkg\-scansources\fR(8). -.sp -If an override file is specified then a source override file will be looked for with an extension of .src. The \-\-source\-override option can be used to change the source override file that will be used. -.RE -.PP -contents -.RS 3n -The -contents -command generates a contents file from a directory tree. It takes the given directory and recursively searches it for .deb files, and reads the file list from each file. It then sorts and writes to stdout the list of files matched to packages. Directories are not written to the output. If multiple packages own the same file then each package is separated by a comma in the output. -.sp -The option -\fB\-\-db\fR -can be used to specify a binary caching DB. -.RE -.PP -release -.RS 3n -The -release -command generates a Release file from a directory tree. It recursively searches the given directory for Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and md5sum.txt files. It then writes to stdout a Release file containing an MD5 digest and SHA1 digest for each file. -.sp -Values for the additional metadata fields in the Release file are taken from the corresponding variables under -APT::FTPArchive::Release, e.g. -APT::FTPArchive::Release::Origin. The supported fields are: -Origin, -Label, -Suite, -Version, -Codename, -Date, -Architectures, -Components, -Description. -.RE -.PP -generate -.RS 3n -The -generate -command is designed to be runnable from a cron script and builds indexes according to the given config file. The config language provides a flexible means of specifying which index files are built from which directories, as well as providing a simple means of maintaining the required settings. -.RE -.PP -clean -.RS 3n -The -clean -command tidies the databases used by the given configuration file by removing any records that are no longer necessary. -.RE -.SH "THE GENERATE CONFIGURATION" -.PP -The -generate -command uses a configuration file to describe the archives that are going to be generated. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd. -\fBapt.conf\fR(5) -contains a description of the syntax. Note that the generate configuration is parsed in sectional manner, but -\fBapt.conf\fR(5) -is parsed in a tree manner. This only effects how the scope tag is handled. -.PP -The generate configuration has 4 separate sections, each described below. -.SS "Dir Section" -.PP -The -Dir -section defines the standard directories needed to locate the files required during the generation process. These directories are prepended to certain relative paths defined in later sections to produce a complete an absolute path. -.PP -ArchiveDir -.RS 3n -Specifies the root of the FTP archive, in a standard Debian configuration this is the directory that contains the -\fIls\-LR\fR -and dist nodes. -.RE -.PP -OverrideDir -.RS 3n -Specifies the location of the override files. -.RE -.PP -CacheDir -.RS 3n -Specifies the location of the cache files -.RE -.PP -FileListDir -.RS 3n -Specifies the location of the file list files, if the -FileList -setting is used below. -.RE -.SS "Default Section" -.PP -The -Default -section specifies default values, and settings that control the operation of the generator. Other sections may override these defaults with a per\-section setting. -.PP -Packages::Compress -.RS 3n -Sets the default compression schemes to use for the Package index files. It is a string that contains a space separated list of at least one of: '.' (no compression), 'gzip' and 'bzip2'. The default for all compression schemes is '. gzip'. -.RE -.PP -Packages::Extensions -.RS 3n -Sets the default list of file extensions that are package files. This defaults to '.deb'. -.RE -.PP -Sources::Compress -.RS 3n -This is similar to -Packages::Compress -except that it controls the compression for the Sources files. -.RE -.PP -Sources::Extensions -.RS 3n -Sets the default list of file extensions that are source files. This defaults to '.dsc'. -.RE -.PP -Contents::Compress -.RS 3n -This is similar to -Packages::Compress -except that it controls the compression for the Contents files. -.RE -.PP -DeLinkLimit -.RS 3n -Specifies the number of kilobytes to delink (and replace with hard links) per run. This is used in conjunction with the per\-section -External\-Links -setting. -.RE -.PP -FileMode -.RS 3n -Specifies the mode of all created index files. It defaults to 0644. All index files are set to this mode with no regard to the umask. -.RE -.SS "TreeDefault Section" -.PP -Sets defaults specific to -Tree -sections. All of these variables are substitution variables and have the strings $(DIST), $(SECTION) and $(ARCH) replaced with their respective values. -.PP -MaxContentsChange -.RS 3n -Sets the number of kilobytes of contents files that are generated each day. The contents files are round\-robined so that over several days they will all be rebuilt. -.RE -.PP -ContentsAge -.RS 3n -Controls the number of days a contents file is allowed to be checked without changing. If this limit is passed the mtime of the contents file is updated. This case can occur if the package file is changed in such a way that does not result in a new contents file [override edit for instance]. A hold off is allowed in hopes that new .debs will be installed, requiring a new file anyhow. The default is 10, the units are in days. -.RE -.PP -Directory -.RS 3n -Sets the top of the .deb directory tree. Defaults to -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR -.RE -.PP -SrcDirectory -.RS 3n -Sets the top of the source package directory tree. Defaults to -\fI$(DIST)/$(SECTION)/source/\fR -.RE -.PP -Packages -.RS 3n -Sets the output Packages file. Defaults to -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR -.RE -.PP -Sources -.RS 3n -Sets the output Packages file. Defaults to -\fI$(DIST)/$(SECTION)/source/Sources\fR -.RE -.PP -InternalPrefix -.RS 3n -Sets the path prefix that causes a symlink to be considered an internal link instead of an external link. Defaults to -\fI$(DIST)/$(SECTION)/\fR -.RE -.PP -Contents -.RS 3n -Sets the output Contents file. Defaults to -\fI$(DIST)/Contents\-$(ARCH)\fR. If this setting causes multiple Packages files to map onto a single Contents file (such as the default) then -\fBapt\-ftparchive\fR -will integrate those package files together automatically. -.RE -.PP -Contents::Header -.RS 3n -Sets header file to prepend to the contents output. -.RE -.PP -BinCacheDB -.RS 3n -Sets the binary cache database to use for this section. Multiple sections can share the same database. -.RE -.PP -FileList -.RS 3n -Specifies that instead of walking the directory tree, -\fBapt\-ftparchive\fR -should read the list of files from the given file. Relative files names are prefixed with the archive directory. -.RE -.PP -SourceFileList -.RS 3n -Specifies that instead of walking the directory tree, -\fBapt\-ftparchive\fR -should read the list of files from the given file. Relative files names are prefixed with the archive directory. This is used when processing source indexs. -.RE -.SS "Tree Section" -.PP -The -Tree -section defines a standard Debian file tree which consists of a base directory, then multiple sections in that base directory and finally multiple Architectures in each section. The exact pathing used is defined by the -Directory -substitution variable. -.PP -The -Tree -section takes a scope tag which sets the -$(DIST) -variable and defines the root of the tree (the path is prefixed by -ArchiveDir). Typically this is a setting such as -\fIdists/woody\fR. -.PP -All of the settings defined in the -TreeDefault -section can be use in a -Tree -section as well as three new variables. -.PP -When processing a -Tree -section -\fBapt\-ftparchive\fR -performs an operation similar to: -.sp .RS 3n .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE -.PP -Sections -.RS 3n -This is a space separated list of sections which appear under the distribution, typically this is something like -main contrib non\-free -.RE -.PP -Architectures -.RS 3n -This is a space separated list of all the architectures that appear under search section. The special architecture 'source' is used to indicate that this tree has a source archive. -.RE -.PP -BinOverride -.RS 3n -Sets the binary override file. The override file contains section, priority and maintainer address information. -.RE -.PP -SrcOverride -.RS 3n -Sets the source override file. The override file contains section information. -.RE -.PP -ExtraOverride -.RS 3n -Sets the binary extra override file. -.RE -.PP -SrcExtraOverride -.RS 3n -Sets the source extra override file. -.RE -.SS "BinDirectory Section" -.PP -The -bindirectory -section defines a binary directory tree with no special structure. The scope tag specifies the location of the binary directory and the settings are similar to the -Tree -section with no substitution variables or -SectionArchitecture -settings. -.PP -Packages -.RS 3n -Sets the Packages file output. -.RE -.PP -Sources -.RS 3n -Sets the Sources file output. At least one of -Packages -or -Sources -is required. -.RE -.PP -Contents -.RS 3n -Sets the Contents file output. (optional) -.RE -.PP -BinOverride -.RS 3n -Sets the binary override file. -.RE -.PP -SrcOverride -.RS 3n -Sets the source override file. -.RE -.PP -ExtraOverride -.RS 3n -Sets the binary extra override file. -.RE -.PP -SrcExtraOverride -.RS 3n -Sets the source extra override file. -.RE -.PP -BinCacheDB -.RS 3n -Sets the cache DB. -.RE -.PP -PathPrefix -.RS 3n -Appends a path to all the output paths. -.RE -.PP -FileList, SourceFileList -.RS 3n -Specifies the file list file. -.RE -.SH "THE BINARY OVERRIDE FILE" -.PP -The binary override file is fully compatible with -\fBdpkg\-scanpackages\fR(8). It contains 4 fields separated by spaces. The first field is the package name, the second is the priority to force that package to, the third is the the section to force that package to and the final field is the maintainer permutation field. -.PP -The general form of the maintainer field is: -.sp -.RS 3n -.nf -old [// oldn]* => new -.fi -.RE -.sp -or simply, -.sp -.RS 3n -.nf -new -.fi -.RE -.sp -The first form allows a double\-slash separated list of old email addresses to be specified. If any of those are found then new is substituted for the maintainer field. The second form unconditionally substitutes the maintainer field. -.SH "THE SOURCE OVERRIDE FILE" -.PP -The source override file is fully compatible with -\fBdpkg\-scansources\fR(8). It contains 2 fields separated by spaces. The first fields is the source package name, the second is the section to assign it. -.SH "THE EXTRA OVERRIDE FILE" -.PP -The extra override file allows any arbitrary tag to be added or replaced in the output. It has 3 columns, the first is the package, the second is the tag and the remainder of the line is the new value. -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-\-md5\fR -.RS 3n -Generate MD5 sums. This defaults to on, when turned off the generated index files will not have MD5Sum fields where possible. Configuration Item: -APT::FTPArchive::MD5 -.RE -.PP -\fB\-d\fR, \fB\-\-db\fR -.RS 3n -Use a binary caching DB. This has no effect on the generate command. Configuration Item: -APT::FTPArchive::DB. -.RE -.PP -\fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Quiet; produces output suitable for logging, omitting progress indicators. More q's will produce more quiet up to a maximum of 2. You can also use -\fB\-q=#\fR -to set the quiet level, overriding the configuration file. Configuration Item: -quiet. -.RE -.PP -\fB\-\-delink\fR -.RS 3n -Perform Delinking. If the -External\-Links -setting is used then this option actually enables delinking of the files. It defaults to on and can be turned off with -\fB\-\-no\-delink\fR. Configuration Item: -APT::FTPArchive::DeLinkAct. -.RE -.PP -\fB\-\-contents\fR -.RS 3n -Perform contents generation. When this option is set and package indexes are being generated with a cache DB then the file listing will also be extracted and stored in the DB for later use. When using the generate command this option also allows the creation of any Contents files. The default is on. Configuration Item: -APT::FTPArchive::Contents. -.RE -.PP -\fB\-s\fR, \fB\-\-source\-override\fR -.RS 3n -Select the source override file to use with the -sources -command. Configuration Item: -APT::FTPArchive::SourceOverride. -.RE -.PP -\fB\-\-readonly\fR -.RS 3n -Make the caching databases read only. Configuration Item: -APT::FTPArchive::ReadOnlyDB. -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "EXAMPLES" -.PP -To create a compressed Packages file for a directory containing binary packages (.deb): -.sp -.RS 3n -.nf -\fBapt\-ftparchive\fR packages \fIdirectory\fR | \fBgzip\fR > \fIPackages.gz\fR -.fi -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5) -.SH "DIAGNOSTICS" -.PP -\fBapt\-ftparchive\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 8cfbc72..de7e5f7 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -327,7 +327,7 @@ Specifies that instead of walking the directory tree, apt-ftparchive should read the list of files from the given file. Relative files names are prefixed with the archive directory. - This is used when processing source indexs. + This is used when processing source indexes. diff --git a/doc/apt-get.8 b/doc/apt-get.8 deleted file mode 100644 index 74d5738..0000000 --- a/doc/apt-get.8 +++ /dev/null @@ -1,476 +0,0 @@ -.\" Title: apt\-get -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-GET" "8" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-get \- APT package handling utility \-\- command\-line interface -.SH "SYNOPSIS" -.HP 8 -\fBapt\-get\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[update] | [upgrade] | [dselect\-upgrade] | [install\ \fIpkg\fR...] | [remove\ \fIpkg\fR...] | [source\ \fIpkg\fR...] | [build\-dep\ \fIpkg\fR...] | [check] | [clean] | [autoclean]} -.SH "DESCRIPTION" -.PP -\fBapt\-get\fR -is the command\-line tool for handling packages, and may be considered the user's "back\-end" to other tools using the APT library. Several "front\-end" interfaces exist, such as dselect(8), aptitude, synaptic, gnome\-apt and wajig. -.PP -Unless the -\fB\-h\fR, or -\fB\-\-help\fR -option is given, one of the commands below must be present. -.PP -update -.RS 3n -update -is used to resynchronize the package index files from their sources. The indexes of available packages are fetched from the location(s) specified in -\fI/etc/apt/sources.list\fR. For example, when using a Debian archive, this command retrieves and scans the -\fIPackages.gz\fR -files, so that information about new and updated packages is available. An -update -should always be performed before an -upgrade -or -dist\-upgrade. Please be aware that the overall progress meter will be incorrect as the size of the package files cannot be known in advance. -.RE -.PP -upgrade -.RS 3n -upgrade -is used to install the newest versions of all packages currently installed on the system from the sources enumerated in -\fI/etc/apt/sources.list\fR. Packages currently installed with new versions available are retrieved and upgraded; under no circumstances are currently installed packages removed, or packages not already installed retrieved and installed. New versions of currently installed packages that cannot be upgraded without changing the install status of another package will be left at their current version. An -update -must be performed first so that -\fBapt\-get\fR -knows that new versions of packages are available. -.RE -.PP -dselect\-upgrade -.RS 3n -dselect\-upgrade -is used in conjunction with the traditional Debian packaging front\-end, -\fBdselect\fR(8). -dselect\-upgrade -follows the changes made by -\fBdselect\fR(8) -to the -Status -field of available packages, and performs the actions necessary to realize that state (for instance, the removal of old and the installation of new packages). -.RE -.PP -dist\-upgrade -.RS 3n -dist\-upgrade -in addition to performing the function of -upgrade, also intelligently handles changing dependencies with new versions of packages; -\fBapt\-get\fR -has a "smart" conflict resolution system, and it will attempt to upgrade the most important packages at the expense of less important ones if necessary. The -\fI/etc/apt/sources.list\fR -file contains a list of locations from which to retrieve desired package files. See also -\fBapt_preferences\fR(5) -for a mechanism for overriding the general settings for individual packages. -.RE -.PP -install -.RS 3n -install -is followed by one or more packages desired for installation. Each package is a package name, not a fully qualified filename (for instance, in a Debian GNU/Linux system, libc6 would be the argument provided, not -libc6_1.9.6\-2.deb) All packages required by the package(s) specified for installation will also be retrieved and installed. The -\fI/etc/apt/sources.list\fR -file is used to locate the desired packages. If a hyphen is appended to the package name (with no intervening space), the identified package will be removed if it is installed. Similarly a plus sign can be used to designate a package to install. These latter features may be used to override decisions made by apt\-get's conflict resolution system. -.sp -A specific version of a package can be selected for installation by following the package name with an equals and the version of the package to select. This will cause that version to be located and selected for install. Alternatively a specific distribution can be selected by following the package name with a slash and the version of the distribution or the Archive name (stable, testing, unstable). -.sp -Both of the version selection mechanisms can downgrade packages and must be used with care. -.sp -Finally, the -\fBapt_preferences\fR(5) -mechanism allows you to create an alternative installation policy for individual packages. -.sp -If no package matches the given expression and the expression contains one of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and it is applied to all package names in the database. Any matches are then installed (or removed). Note that matching is done by substring so 'lo.*' matches 'how\-lo' and 'lowest'. If this is undesired, anchor the regular expression with a '^' or '$' character, or create a more specific regular expression. -.RE -.PP -remove -.RS 3n -remove -is identical to -install -except that packages are removed instead of installed. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. -.RE -.PP -source -.RS 3n -source -causes -\fBapt\-get\fR -to fetch source packages. APT will examine the available packages to decide which source package to fetch. It will then find and download into the current directory the newest available version of that source package. Source packages are tracked separately from binary packages via -deb\-src -type lines in the -\fBsources.list\fR(5) -file. This probably will mean that you will not get the same source as the package you have installed or as you could install. If the \-\-compile options is specified then the package will be compiled to a binary .deb using dpkg\-buildpackage, if \-\-download\-only is specified then the source package will not be unpacked. -.sp -A specific source version can be retrieved by postfixing the source name with an equals and then the version to fetch, similar to the mechanism used for the package files. This enables exact matching of the source package name and version, implicitly enabling the -APT::Get::Only\-Source -option. -.sp -Note that source packages are not tracked like binary packages, they exist only in the current directory and are similar to downloading source tar balls. -.RE -.PP -build\-dep -.RS 3n -build\-dep -causes apt\-get to install/remove packages in an attempt to satisfy the build dependencies for a source package. -.RE -.PP -check -.RS 3n -check -is a diagnostic tool; it updates the package cache and checks for broken dependencies. -.RE -.PP -clean -.RS 3n -clean -clears out the local repository of retrieved package files. It removes everything but the lock file from -\fI/var/cache/apt/archives/\fR -and -\fI/var/cache/apt/archives/partial/\fR. When APT is used as a -\fBdselect\fR(8) -method, -clean -is run automatically. Those who do not use dselect will likely want to run -apt\-get clean -from time to time to free up disk space. -.RE -.PP -autoclean -.RS 3n -Like -clean, -autoclean -clears out the local repository of retrieved package files. The difference is that it only removes package files that can no longer be downloaded, and are largely useless. This allows a cache to be maintained over a long period without it growing out of control. The configuration option -APT::Clean\-Installed -will prevent installed packages from being erased if it is set to off. -.RE -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-d\fR, \fB\-\-download\-only\fR -.RS 3n -Download only; package files are only retrieved, not unpacked or installed. Configuration Item: -APT::Get::Download\-Only. -.RE -.PP -\fB\-f\fR, \fB\-\-fix\-broken\fR -.RS 3n -Fix; attempt to correct a system with broken dependencies in place. This option, when used with install/remove, can omit any packages to permit APT to deduce a likely solution. Any Package that are specified must completely correct the problem. The option is sometimes necessary when running APT for the first time; APT itself does not allow broken package dependencies to exist on a system. It is possible that a system's dependency structure can be so corrupt as to require manual intervention (which usually means using -\fBdselect\fR(8) -or -\fBdpkg \-\-remove\fR -to eliminate some of the offending packages). Use of this option together with -\fB\-m\fR -may produce an error in some situations. Configuration Item: -APT::Get::Fix\-Broken. -.RE -.PP -\fB\-m\fR, \fB\-\-ignore\-missing\fR, \fB\-\-fix\-missing\fR -.RS 3n -Ignore missing packages; If packages cannot be retrieved or fail the integrity check after retrieval (corrupted package files), hold back those packages and handle the result. Use of this option together with -\fB\-f\fR -may produce an error in some situations. If a package is selected for installation (particularly if it is mentioned on the command line) and it could not be downloaded then it will be silently held back. Configuration Item: -APT::Get::Fix\-Missing. -.RE -.PP -\fB\-\-no\-download\fR -.RS 3n -Disables downloading of packages. This is best used with -\fB\-\-ignore\-missing\fR -to force APT to use only the .debs it has already downloaded. Configuration Item: -APT::Get::Download. -.RE -.PP -\fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Quiet; produces output suitable for logging, omitting progress indicators. More q's will produce more quiet up to a maximum of 2. You can also use -\fB\-q=#\fR -to set the quiet level, overriding the configuration file. Note that quiet level 2 implies -\fB\-y\fR, you should never use \-qq without a no\-action modifier such as \-d, \-\-print\-uris or \-s as APT may decided to do something you did not expect. Configuration Item: -quiet. -.RE -.PP -\fB\-s\fR, \fB\-\-simulate\fR, \fB\-\-just\-print\fR, \fB\-\-dry\-run\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -No action; perform a simulation of events that would occur but do not actually change the system. Configuration Item: -APT::Get::Simulate. -.sp -Simulate prints out a series of lines each one representing a dpkg operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with and empty set of square brackets meaning breaks that are of no consequence (rare). -.RE -.PP -\fB\-y\fR, \fB\-\-yes\fR, \fB\-\-assume\-yes\fR -.RS 3n -Automatic yes to prompts; assume "yes" as answer to all prompts and run non\-interactively. If an undesirable situation, such as changing a held package, trying to install a unauthenticated package or removing an essential package occurs then -apt\-get -will abort. Configuration Item: -APT::Get::Assume\-Yes. -.RE -.PP -\fB\-u\fR, \fB\-\-show\-upgraded\fR -.RS 3n -Show upgraded packages; Print out a list of all packages that are to be upgraded. Configuration Item: -APT::Get::Show\-Upgraded. -.RE -.PP -\fB\-V\fR, \fB\-\-verbose\-versions\fR -.RS 3n -Show full versions for upgraded and installed packages. Configuration Item: -APT::Get::Show\-Versions. -.RE -.PP -\fB\-b\fR, \fB\-\-compile\fR, \fB\-\-build\fR -.RS 3n -Compile source packages after downloading them. Configuration Item: -APT::Get::Compile. -.RE -.PP -\fB\-\-ignore\-hold\fR -.RS 3n -Ignore package Holds; This causes -\fBapt\-get\fR -to ignore a hold placed on a package. This may be useful in conjunction with -dist\-upgrade -to override a large number of undesired holds. Configuration Item: -APT::Ignore\-Hold. -.RE -.PP -\fB\-\-no\-upgrade\fR -.RS 3n -Do not upgrade packages; When used in conjunction with -install, -no\-upgrade -will prevent packages on the command line from being upgraded if they are already installed. Configuration Item: -APT::Get::Upgrade. -.RE -.PP -\fB\-\-force\-yes\fR -.RS 3n -Force yes; This is a dangerous option that will cause apt to continue without prompting if it is doing something potentially harmful. It should not be used except in very special situations. Using -force\-yes -can potentially destroy your system! Configuration Item: -APT::Get::force\-yes. -.RE -.PP -\fB\-\-print\-uris\fR -.RS 3n -Instead of fetching the files to install their URIs are printed. Each URI will have the path, the destination file name, the size and the expected md5 hash. Note that the file name to write to will not always match the file name on the remote site! This also works with the -source -and -update -commands. When used with the -update -command the MD5 and size are not included, and it is up to the user to decompress any compressed files. Configuration Item: -APT::Get::Print\-URIs. -.RE -.PP -\fB\-\-purge\fR -.RS 3n -Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are scheduled to be purged. Configuration Item: -APT::Get::Purge. -.RE -.PP -\fB\-\-reinstall\fR -.RS 3n -Re\-Install packages that are already installed and at the newest version. Configuration Item: -APT::Get::ReInstall. -.RE -.PP -\fB\-\-list\-cleanup\fR -.RS 3n -This option defaults to on, use -\-\-no\-list\-cleanup -to turn it off. When on -\fBapt\-get\fR -will automatically manage the contents of -\fI/var/lib/apt/lists\fR -to ensure that obsolete files are erased. The only reason to turn it off is if you frequently change your source list. Configuration Item: -APT::Get::List\-Cleanup. -.RE -.PP -\fB\-t\fR, \fB\-\-target\-release\fR, \fB\-\-default\-release\fR -.RS 3n -This option controls the default input to the policy engine, it creates a default pin at priority 990 using the specified release string. The preferences file may further override this setting. In short, this option lets you have simple control over which distribution packages will be retrieved from. Some common examples might be -\fB\-t '2.1*'\fR -or -\fB\-t unstable\fR. Configuration Item: -APT::Default\-Release; see also the -\fBapt_preferences\fR(5) -manual page. -.RE -.PP -\fB\-\-trivial\-only\fR -.RS 3n -Only perform operations that are 'trivial'. Logically this can be considered related to -\fB\-\-assume\-yes\fR, where -\fB\-\-assume\-yes\fR -will answer yes to any prompt, -\fB\-\-trivial\-only\fR -will answer no. Configuration Item: -APT::Get::Trivial\-Only. -.RE -.PP -\fB\-\-no\-remove\fR -.RS 3n -If any packages are to be removed apt\-get immediately aborts without prompting. Configuration Item: -APT::Get::Remove. -.RE -.PP -\fB\-\-only\-source\fR -.RS 3n -Only has meaning for the -source -and -build\-dep -commands. Indicates that the given source names are not to be mapped through the binary table. This means that if this option is specified, these commands will only accept source package names as arguments, rather than accepting binary package names and looking up the corresponding source package. Configuration Item: -APT::Get::Only\-Source. -.RE -.PP -\fB\-\-diff\-only\fR, \fB\-\-tar\-only\fR -.RS 3n -Download only the diff or tar file of a source archive. Configuration Item: -APT::Get::Diff\-Only -and -APT::Get::Tar\-Only. -.RE -.PP -\fB\-\-arch\-only\fR -.RS 3n -Only process architecture\-dependent build\-dependencies. Configuration Item: -APT::Get::Arch\-Only. -.RE -.PP -\fB\-\-allow\-unauthenticated\fR -.RS 3n -Ignore if packages can't be authenticated and don't prompt about it. This is usefull for tools like pbuilder. Configuration Item: -APT::Get::AllowUnauthenticated. -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "FILES" -.PP -\fI/etc/apt/sources.list\fR -.RS 3n -Locations to fetch packages from. Configuration Item: -Dir::Etc::SourceList. -.RE -.PP -\fI/etc/apt/apt.conf\fR -.RS 3n -APT configuration file. Configuration Item: -Dir::Etc::Main. -.RE -.PP -\fI/etc/apt/apt.conf.d/\fR -.RS 3n -APT configuration file fragments Configuration Item: -Dir::Etc::Parts. -.RE -.PP -\fI/etc/apt/preferences\fR -.RS 3n -Version preferences file. This is where you would specify "pinning", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: -Dir::Etc::Preferences. -.RE -.PP -\fI/var/cache/apt/archives/\fR -.RS 3n -Storage area for retrieved package files. Configuration Item: -Dir::Cache::Archives. -.RE -.PP -\fI/var/cache/apt/archives/partial/\fR -.RS 3n -Storage area for package files in transit. Configuration Item: -Dir::Cache::Archives -(implicit partial). -.RE -.PP -\fI/var/lib/apt/lists/\fR -.RS 3n -Storage area for state information for each package resource specified in -\fBsources.list\fR(5) -Configuration Item: -Dir::State::Lists. -.RE -.PP -\fI/var/lib/apt/lists/partial/\fR -.RS 3n -Storage area for state information in transit. Configuration Item: -Dir::State::Lists -(implicit partial). -.RE -.SH "SEE ALSO" -.PP -\fBapt\-cache\fR(8), -\fBapt\-cdrom\fR(8), -\fBdpkg\fR(8), -\fBdselect\fR(8), -\fBsources.list\fR(5), -\fBapt.conf\fR(5), -\fBapt\-config\fR(8), -\fBapt\-secure\fR(8), The APT User's guide in /usr/share/doc/apt\-doc/, -\fBapt_preferences\fR(5), the APT Howto. -.SH "DIAGNOSTICS" -.PP -\fBapt\-get\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 17f663a..c1b3470 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 08 November 2008 @@ -33,20 +33,74 @@ apt-get - - - + + + + + + + + + + + + target_release_name + + + target_release_number_expression + + + + - update - upgrade - dselect-upgrade - install pkg - remove pkg - source pkg - build-dep pkg - check - clean - autoclean + update + upgrade + dselect-upgrade + dist-upgrade + install + pkg + + + + =pkg_version_number + + + /target_release_name + + + + + + remove pkg + purge pkg + source + pkg + + =pkg_version_number + + + + build-dep pkg + check + clean + autoclean + autoremove + + + -v + --version + + + + + -h + --help + + @@ -54,8 +108,8 @@ Description apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as dselect(8), - aptitude, synaptic, gnome-apt and wajig. + library. Several "front-end" interfaces exist, such as &dselect;, + &aptitude;, &synaptic;, &gnome-apt; and &wajig;. Unless the , or option is given, one of the commands below must be present. @@ -102,6 +156,7 @@ with new versions of packages; apt-get has a "smart" conflict resolution system, and it will attempt to upgrade the most important packages at the expense of less important ones if necessary. + So, dist-upgrade command may remove some packages. The /etc/apt/sources.list file contains a list of locations from which to retrieve desired package files. See also &apt-preferences; for a mechanism for @@ -109,17 +164,24 @@ install - install is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not libc6_1.9.6-2.deb) All packages required - by the package(s) specified for installation will also be retrieved and - installed. The /etc/apt/sources.list file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system. + + install is followed by one or more + packages desired for installation or upgrading. + Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, + libc6 would be the argument provided, not + libc6_1.9.6-2.deb). All packages required + by the package(s) specified for installation will also + be retrieved and installed. + The /etc/apt/sources.list file is + used to locate the desired packages. If a hyphen is + appended to the package name (with no intervening space), + the identified package will be removed if it is installed. + Similarly a plus sign can be used to designate a + package to install. These latter features may be used + to override decisions made by apt-get's conflict + resolution system. + A specific version of a package can be selected for installation by following the package name with an equals and the version of the package @@ -131,6 +193,17 @@ Both of the version selection mechanisms can downgrade packages and must be used with care. + This is also the target to use if you want to upgrade one or + more already-installed packages without upgrading every package + you have on your system. Unlike the "upgrade" target, which + installs the newest version of all currently installed packages, + "install" will install the newest version of only the package(s) + specified. Simply provide the name of the package(s) you wish + to upgrade, and if a newer version is available, it (and its + dependencies, as described above) will be downloaded and + installed. + + Finally, the &apt-preferences; mechanism allows you to create an alternative installation policy for individual packages. @@ -146,11 +219,17 @@ remove remove is identical to install except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. + purge + purge is identical to remove except that packages are + removed and purged (any configuration files are deleted too). + + source source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to @@ -203,6 +282,11 @@ APT::Clean-Installed will prevent installed packages from being erased if it is set to off. + + autoremove + autoremove is used to remove packages that were automatically + installed to satisfy dependencies for some package and that are no more needed. + @@ -210,6 +294,11 @@ &apt-cmdblurb; + + Do not consider recommended packages as a dependency for installing. + Configuration Item: APT::Install-Recommends. + + Download only; package files are only retrieved, not unpacked or installed. Configuration Item: APT::Get::Download-Only. @@ -337,7 +426,8 @@ Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. is equivalent for + command. Configuration Item: APT::Get::Purge. @@ -359,8 +449,10 @@ This option controls the default input to the policy engine, it creates - a default pin at priority 990 using the specified release string. The - preferences file may further override this setting. In short, this option + a default pin at priority 990 using the specified release string. + This overrides the general settings in /etc/apt/preferences. + Specifically pinned packages are not affected by the value + of this option. In short, this option lets you have simple control over which distribution packages will be retrieved from. Some common examples might be or . @@ -382,6 +474,13 @@ Configuration Item: APT::Get::Remove. + + If the command is either install or remove, + then this option acts like running autoremove command, removing the unused + dependency packages. Configuration Item: APT::Get::AutomaticRemove. + + + Only has meaning for the source and build-dep @@ -393,9 +492,9 @@ Item: APT::Get::Only-Source. - - Download only the diff or tar file of a source archive. - Configuration Item: APT::Get::Diff-Only and + + Download only the diff, dsc, or tar file of a source archive. + Configuration Item: APT::Get::Diff-Only, APT::Get::Dsc-Only, and APT::Get::Tar-Only. @@ -406,7 +505,7 @@ Ignore if packages can't be authenticated and don't prompt about it. - This is usefull for tools like pbuilder. + This is useful for tools like pbuilder. Configuration Item: APT::Get::AllowUnauthenticated. @@ -429,7 +528,7 @@ /etc/apt/apt.conf.d/ - APT configuration file fragments + APT configuration file fragments. Configuration Item: Dir::Etc::Parts. @@ -474,7 +573,16 @@ Diagnostics apt-get returns zero on normal operation, decimal 100 on error. - + + ORIGINAL AUTHORS + &apt-author.jgunthorpe; + + + CURRENT AUTHORS + + &apt-author.team; + + &apt-qapage; + &manbugs; - diff --git a/doc/apt-key.8 b/doc/apt-key.8 deleted file mode 100644 index 70d37df..0000000 --- a/doc/apt-key.8 +++ /dev/null @@ -1,97 +0,0 @@ -.\" Title: apt\-key -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 14 December 2003 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-KEY" "8" "14 December 2003" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-key \- APT key management utility -.SH "SYNOPSIS" -.HP 8 -\fBapt\-key\fR [\fIcommand\fR/] [\fB\fIarguments\fR\fR...] -.SH "DESCRIPTION" -.PP - -\fBapt\-key\fR -is used to manage the list of keys used by apt to authenticate packages. Packages which have been authenticated using these keys will be considered trusted. -.SH "COMMANDS" -.PP -add \fIfilename\fR -.RS 3n -Add a new key to the list of trusted keys. The key is read from -\fIfilename\fR, or standard input if -\fIfilename\fR -is -\-. -.RE -.PP -del \fIkeyid\fR -.RS 3n -Remove a key from the list of trusted keys. -.RE -.PP -list -.RS 3n -List trusted keys. -.RE -.PP -update -.RS 3n -Update the local keyring with the keyring of Debian archive keys and removes from the keyring the archive keys which are no longer valid. -.RE -.SH "FILES" -.PP -\fI/etc/apt/trusted.gpg\fR -.RS 3n -Keyring of local trusted keys, new keys will be added here. -.RE -.PP -\fI/etc/apt/trustdb.gpg\fR -.RS 3n -Local trust database of archive keys. -.RE -.PP -\fI/usr/share/keyrings/debian\-archive\-keyring.gpg\fR -.RS 3n -Keyring of Debian archive trusted keys. -.RE -.PP -\fI/usr/share/keyrings/debian\-archive\-removed\-keys.gpg\fR -.RS 3n -Keyring of Debian archive removed trusted keys. -.RE -.SH "SEE ALSO" -.PP - -\fBapt\-get\fR(8), -\fBapt\-secure\fR(8) -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHOR" -.PP -APT was written by the APT team -. -.SH "AUTHOR" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe -.br -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index eac6130..4b3e7c2 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -63,6 +63,28 @@ + export keyid + + + + Output the key keyid to standard output. + + + + + + + exportall + + + + Output all trusted keys to standard output. + + + + + + list @@ -71,6 +93,29 @@ + + + + finger + + + + List fingerprints of trusted keys. + + + + + + + adv + + + + Pass advanced options to gpg. With adv --recv-key you can download the + public key. + + + diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml new file mode 100644 index 0000000..1b7b028 --- /dev/null +++ b/doc/apt-mark.8.xml @@ -0,0 +1,114 @@ + + +%aptent; + +]> + + + + + &apt-author.moconnor; + &apt-author.team; + &apt-email; + &apt-product; + + 2 November 2007 + + + + apt-mark + 8 + + + + + apt-mark + mark/unmark a package as being automatically-installed + + + + + + apt-mark + + + markautounmarkauto + package + + + + Description + apt-mark will change whether a package has + been marked as being automatically installed. + + + When you request that a package is installed, and as a result + other packages are installed to satisfy its dependencies, the + dependencies are marked as being automatically installed. Once + these automatically installed packages are no longer depended on + by any manually installed packages, they will be removed. + + + markauto + markauto is used to mark a + package as being automatically installed, which will cause the + package to be removed when no more manually installed packages + depend on this package. + + + + unmarkauto + unmarkauto is used to mark a + package as being manually installed, which will prevent the + package from being automatically removed if no other packages + depend on it. + + + + + + options + + + + + + Read/Write package stats from FILENAME + instead of the default location, which + is extended_status in the directory defined + by the Configuration Item: Dir::State. + + + + + Show a short usage summary. + + + + + + + + Show the program version. + + + + + + + + + See Also + &apt-conf; + + + Diagnostics + apt-mark returns zero on normal operation, non-zero on error. + + + &manbugs; + + diff --git a/doc/apt-secure.8 b/doc/apt-secure.8 deleted file mode 100644 index 9b7c448..0000000 --- a/doc/apt-secure.8 +++ /dev/null @@ -1,137 +0,0 @@ -.\" Title: apt\-secure -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 14 December 2003 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-SECURE" "8" "14 December 2003" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-secure \- Archive authentication support for APT -.SH "DESCRIPTION" -.PP -Starting with version 0.6, -\fBapt\fR -contains code that does signature checking of the Release file for all archives. This ensures that packages in the archive can't be modified by people who have no access to the Release file signing key. -.PP -If a package comes from a archive without a signature or with a signature that apt does not have a key for that package is considered untrusted and installing it will result in a big warning. -\fBapt\-get\fR -will currently only warn for unsigned archives, future releases might force all sources to be verified before downloading packages from them. -.PP -The package frontends -\fBapt\-get\fR(8), -\fBaptitude\fR(8) -and -\fBsynaptic\fR(8) -support this new authentication feature. -.SH "TRUSTED ARCHIVES" -.PP -The chain of trust from an apt archive to the end user is made up of different steps. -\fBapt\-secure\fR -is the last step in this chain, trusting an archive does not mean that the packages that you trust it do not contain malicious code but means that you trust the archive maintainer. Its the archive maintainer responsibility to ensure that the archive integrity is correct. -.PP -apt\-secure does not review signatures at a package level. If you require tools to do this you should look at -\fBdebsig\-verify\fR -and -\fBdebsign\fR -(provided in the debsig\-verify and devscripts packages respectively). -.PP -The chain of trust in Debian starts when a maintainer uploads a new package or a new version of a package to the Debian archive. This upload in order to become effective needs to be signed by a key of a maintainer within the Debian maintainer's keyring (available in the debian\-keyring package). Maintainer's keys are signed by other maintainers following pre\-established procedures to ensure the identity of the key holder. -.PP -Once the uploaded package is verified and included in the archive, the maintainer signature is stripped off, an MD5 sum of the package is computed and put in the Packages file. The MD5 sum of all of the packages files are then computed and put into the Release file. The Release file is then signed by the archive key (which is created once a year and distributed through the FTP server. This key is also on the Debian keyring. -.PP -Any end user can check the signature of the Release file, extract the MD5 sum of a package from it and compare it with the MD5 sum of the package he downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian package was checked. Now both the MD5 sum and the signature of the Release file are checked. -.PP -Notice that this is distinct from checking signatures on a per package basis. It is designed to prevent two possible attacks: -.TP 3n -\(bu -Network "man in the middle" attacks. Without signature checking, a malicious agent can introduce himself in the package download process and provide malicious software either by controlling a network element (router, switch, etc.) or by redirecting traffic to a rogue server (through arp or DNS spoofing attacks). -.TP 3n -\(bu -Mirror network compromise. Without signature checking, a malicious agent can compromise a mirror host and modify the files in it to propagate malicious software to all users downloading packages from that host. -.PP -However, it does not defend against a compromise of the Debian master server itself (which signs the packages) or against a compromise of the key used to sign the Release files. In any case, this mechanism can complement a per\-package signature. -.SH "USER CONFIGURATION" -.PP - -\fBapt\-key\fR -is the program that manages the list of keys used by apt. It can be used to add or remove keys although an installation of this release will automatically provide the default Debian archive signing keys used in the Debian package repositories. -.PP -In order to add a new key you need to first download it (you should make sure you are using a trusted communication channel when retrieving it), add it with -\fBapt\-key\fR -and then run -\fBapt\-get update\fR -so that apt can download and verify the -\fIRelease.gpg\fR -files from the archives you have configured. -.SH "ARCHIVE CONFIGURATION" -.PP -If you want to provide archive signatures in an archive under your maintenance you have to: -.TP 3n -\(bu -Create a toplevel Release file. if it does not exist already. You can do this by running -\fBapt\-ftparchive release\fR -(provided inftp apt\-utils). -.TP 3n -\(bu -Sign it. You can do this by running -\fBgpg \-abs \-o Release.gpg Release\fR. -.TP 3n -\(bu -Publish the key fingerprint, that way your users will know what key they need to import in order to authenticate the files in the archive. -.PP -Whenever the contents of the archive changes (new packages are added or removed) the archive maintainer has to follow the first two steps previously outlined. -.SH "SEE ALSO" -.PP - -\fBapt.conf\fR(5), -\fBapt\-get\fR(8), -\fBsources.list\fR(5), -\fBapt\-key\fR(8), -\fBapt\-archive\fR(1), -\fBdebsign\fR(1) -\fBdebsig\-verify\fR(1), -\fBgpg\fR(1) -.PP -For more backgound information you might want to review the -[1]\&\fIDebian Security Infrastructure\fR -chapter of the Securing Debian Manual (available also in the harden\-doc package) and the -[2]\&\fIStrong Distribution HOWTO\fR -by V. Alex Brennen. -.SH "BUGS" -.PP -[3]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHOR" -.PP -APT was written by the APT team -. -.SH "MANPAGE AUTHORS" -.PP -This man\-page is based on the work of Javier Fernández\-Sanguino Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt. -.SH "AUTHOR" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe -.br -.SH "REFERENCES" -.TP 3 -1.\ Debian Security Infrastructure -\%http://www.debian.org/doc/manuals/securing\-debian\-howto/ch7.en.html -.TP 3 -2.\ Strong Distribution HOWTO -\%http://www.cryptnet.net/fdp/crypto/strong_distro.html -.TP 3 -3.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index fa13ddc..9696e01 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -159,7 +159,7 @@ Create a toplevel Release file. if it does not exist already. You can do this by running apt-ftparchive release - (provided inftp apt-utils). + (provided in apt-utils). Sign it. You can do this by running gpg -abs -o Release.gpg Release. @@ -179,11 +179,11 @@ See Also -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; -For more backgound information you might want to review the +For more background information you might want to review the Debian Security Infrastructure chapter of the Securing Debian Manual diff --git a/doc/apt-sortpkgs.1 b/doc/apt-sortpkgs.1 deleted file mode 100644 index e6d80b9..0000000 --- a/doc/apt-sortpkgs.1 +++ /dev/null @@ -1,87 +0,0 @@ -.\" Title: apt\-sortpkgs -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT\-SORTPKGS" "1" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt\-sortpkgs \- Utility to sort package index files -.SH "SYNOPSIS" -.HP 13 -\fBapt\-sortpkgs\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] \fIfile\fR... -.SH "DESCRIPTION" -.PP -\fBapt\-sortpkgs\fR -will take an index file (Source index or Package index) and sort the records so that they are ordered by the package name. It will also sort the internal fields of each record according to the internal sorting rules. -.PP -All output is sent to stdout, the input must be a seekable file. -.SH "OPTIONS" -.PP -All command line options may be set using the configuration file, the descriptions indicate the configuration option to set. For boolean options you can override the config file by using something like -\fB\-f\-\fR,\fB\-\-no\-f\fR, -\fB\-f=no\fR -or several other variations. -.PP -\fB\-s\fR, \fB\-\-source\fR -.RS 3n -Use Source index field ordering. Configuration Item: -APT::SortPkgs::Source. -.RE -.PP -\fB\-h\fR, \fB\-\-help\fR -.RS 3n -Show a short usage summary. -.RE -.PP -\fB\-v\fR, \fB\-\-version\fR -.RS 3n -Show the program version. -.RE -.PP -\fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this configuration file. See -\fBapt.conf\fR(5) -for syntax information. -.RE -.PP -\fB\-o\fR, \fB\-\-option\fR -.RS 3n -Set a Configuration Option; This will set an arbitary configuration option. The syntax is -\fB\-o Foo::Bar=bar\fR. -.RE -.SH "SEE ALSO" -.PP -\fBapt.conf\fR(5) -.SH "DIAGNOSTICS" -.PP -\fBapt\-sortpkgs\fR -returns zero on normal operation, decimal 100 on error. -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt.8 b/doc/apt.8 index 6f39c53..78e4f0a 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -20,10 +20,14 @@ apt \- Advanced Package Tool .SH SYNOPSIS .B apt .SH DESCRIPTION -APT is a management system for software packages. It is still -under development; the snazzy front ends are not yet available. In the -meantime, please see -.BR apt-get (8). +APT is a management system for software packages. For normal day to day +package management there are several frontends available, such as +.BR aptitude (8) +for the command line or +.BR synaptic (8) +for the X Window System. Some options are only implemented in +.BR apt-get (8) +though. .SH OPTIONS None. .SH FILES @@ -33,6 +37,7 @@ None. .BR apt-get (8), .BR apt.conf (5), .BR sources.list (5), +.BR apt_preferences (5), .BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. diff --git a/doc/apt.conf.5 b/doc/apt.conf.5 deleted file mode 100644 index dc9adc8..0000000 --- a/doc/apt.conf.5 +++ /dev/null @@ -1,434 +0,0 @@ -.\" Title: apt.conf -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT.CONF" "5" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt.conf \- Configuration file for APT -.SH "DESCRIPTION" -.PP -\fIapt.conf\fR -is the main configuration file for the APT suite of tools, all tools make use of the configuration file and a common command line parser to provide a uniform environment. When an APT tool starts up it will read the configuration specified by the -\fBAPT_CONFIG\fR -environment variable (if any) and then read the files in -Dir::Etc::Parts -then read the main configuration file specified by -Dir::Etc::main -then finally apply the command line options to override the configuration directives, possibly loading even more config files. -.PP -The configuration file is organized in a tree with options organized into functional groups. option specification is given with a double colon notation, for instance -APT::Get::Assume\-Yes -is an option within the APT tool group, for the Get tool. options do not inherit from their parent groups. -.PP -Syntacticly the configuration language is modeled after what the ISC tools such as bind and dhcp use. Lines starting with -// -are treated as comments (ignored). Each line is of the form -APT::Get::Assume\-Yes "true"; -The trailing semicolon is required and the quotes are optional. A new scope can be opened with curly braces, like: -.sp -.RS 3n -.nf - -APT { - Get { - Assume\-Yes "true"; - Fix\-Broken "true"; - }; -}; -.fi -.RE -.PP -with newlines placed to make it more readable. Lists can be created by opening a scope and including a single word enclosed in quotes followed by a semicolon. Multiple entries can be included, each separated by a semicolon. -.sp -.RS 3n -.nf - -DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; -.fi -.RE -.PP -In general the sample configuration file in -\fI/usr/share/doc/apt/examples/apt.conf\fR -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -is a good guide for how it should look. -.PP -Two specials are allowed, -#include -and -#clear -#include -will include the given file, unless the filename ends in a slash, then the whole directory is included. -#clear -is used to erase a list of names. -.PP -All of the APT tools take a \-o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option name (APT::Get::Assume\-Yes -for instance) followed by an equals sign then the new value of the option. Lists can be appended too by adding a trailing :: to the list name. -.SH "THE APT GROUP" -.PP -This group of options controls general APT behavior as well as holding the options for all of the tools. -.PP -Architecture -.RS 3n -System Architecture; sets the architecture to use when fetching files and parsing package lists. The internal default is the architecture apt was compiled for. -.RE -.PP -Ignore\-Hold -.RS 3n -Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. -.RE -.PP -Clean\-Installed -.RS 3n -Defaults to on. When turned on the autoclean feature will remove any packages which can no longer be downloaded from the cache. If turned off then packages that are locally installed are also excluded from cleaning \- but note that APT provides no direct means to reinstall them. -.RE -.PP -Immediate\-Configure -.RS 3n -Disable Immediate Configuration; This dangerous option disables some of APT's ordering code to cause it to make fewer dpkg calls. Doing so may be necessary on some extremely slow single user systems but is very dangerous and may cause package install scripts to fail or worse. Use at your own risk. -.RE -.PP -Force\-LoopBreak -.RS 3n -Never Enable this option unless you \-really\- know what you are doing. It permits APT to temporarily remove an essential package to break a Conflicts/Conflicts or Conflicts/Pre\-Depend loop between two essential packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the essential packages are not tar, gzip, libc, dpkg, bash or anything that those packages depend on. -.RE -.PP -Cache\-Limit -.RS 3n -APT uses a fixed size memory mapped cache file to store the 'available' information. This sets the size of that cache (in bytes). -.RE -.PP -Build\-Essential -.RS 3n -Defines which package(s) are considered essential build dependencies. -.RE -.PP -Get -.RS 3n -The Get subsection controls the -\fBapt\-get\fR(8) -tool, please see its documentation for more information about the options here. -.RE -.PP -Cache -.RS 3n -The Cache subsection controls the -\fBapt\-cache\fR(8) -tool, please see its documentation for more information about the options here. -.RE -.PP -CDROM -.RS 3n -The CDROM subsection controls the -\fBapt\-cdrom\fR(8) -tool, please see its documentation for more information about the options here. -.RE -.SH "THE ACQUIRE GROUP" -.PP -The -Acquire -group of options controls the download of packages and the URI handlers. -.PP -Queue\-Mode -.RS 3n -Queuing mode; -Queue\-Mode -can be one of -host -or -access -which determines how APT parallelizes outgoing connections. -host -means that one connection per target host will be opened, -access -means that one connection per URI type will be opened. -.RE -.PP -Retries -.RS 3n -Number of retries to perform. If this is non\-zero APT will retry failed files the given number of times. -.RE -.PP -Source\-Symlinks -.RS 3n -Use symlinks for source archives. If set to true then source archives will be symlinked when possible instead of copying. True is the default. -.RE -.PP -http -.RS 3n -HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard form of -http://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form -http::Proxy:: -with the special keyword -DIRECT -meaning to use no proxies. The -\fBhttp_proxy\fR -environment variable will override all settings. -.sp -Three settings are provided for cache control with HTTP/1.1 compliant proxy caches. -No\-Cache -tells the proxy to not use its cached response under any circumstances, -Max\-Age -is sent only for index files and tells the cache to refresh its object if it is older than the given number of seconds. Debian updates its index files daily so the default is 1 day. -No\-Store -specifies that the cache should never store this request, it is only set for archive files. This may be useful to prevent polluting a proxy cache with very large .deb files. Note: Squid 2.0.2 does not support any of these options. -.sp -The option -timeout -sets the timeout timer used by the method, this applies to all things including connection timeout and data timeout. -.sp -One setting is provided to control the pipeline depth in cases where the remote server is not RFC conforming or buggy (such as Squid 2.0.2) -Acquire::http::Pipeline\-Depth -can be a value from 0 to 5 indicating how many outstanding requests APT should send. A value of zero MUST be specified if the remote host does not properly linger on TCP connections \- otherwise data corruption will occur. Hosts which require this are in violation of RFC 2068. -.RE -.PP -ftp -.RS 3n -FTP URIs; ftp::Proxy is the default proxy server to use. It is in the standard form of -ftp://[[user][:pass]@]host[:port]/ -and is overridden by the -\fBftp_proxy\fR -environment variable. To use a ftp proxy you will have to set the -ftp::ProxyLogin -script in the configuration file. This entry specifies the commands to send to tell the proxy server what to connect to. Please see -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -for an example of how to do this. The subsitution variables available are -$(PROXY_USER) -$(PROXY_PASS) -$(SITE_USER) -$(SITE_PASS) -$(SITE) -and -$(SITE_PORT) -Each is taken from it's respective URI component. -.sp -The option -timeout -sets the timeout timer used by the method, this applies to all things including connection timeout and data timeout. -.sp -Several settings are provided to control passive mode. Generally it is safe to leave passive mode on, it works in nearly every environment. However some situations require that passive mode be disabled and port mode ftp used instead. This can be done globally, for connections that go through a proxy or for a specific host (See the sample config file for examples). -.sp -It is possible to proxy FTP over HTTP by setting the -\fBftp_proxy\fR -environment variable to a http url \- see the discussion of the http method above for syntax. You cannot set this in the configuration file and it is not recommended to use FTP over HTTP due to its low efficiency. -.sp -The setting -ForceExtended -controls the use of RFC2428 -EPSV -and -EPRT -commands. The defaut is false, which means these commands are only used if the control connection is IPv6. Setting this to true forces their use even on IPv4 connections. Note that most FTP servers do not support RFC2428. -.RE -.PP -cdrom -.RS 3n -CDROM URIs; the only setting for CDROM URIs is the mount point, -cdrom::Mount -which must be the mount point for the CDROM drive as specified in -\fI/etc/fstab\fR. It is possible to provide alternate mount and unmount commands if your mount point cannot be listed in the fstab (such as an SMB mount and old mount packages). The syntax is to put -.sp -.RS 3n -.nf -"/cdrom/"::Mount "foo"; -.fi -.RE -.sp -within the cdrom block. It is important to have the trailing slash. Unmount commands can be specified using UMount. -.RE -.PP -gpgv -.RS 3n -GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv. -gpgv::Options -Additional options passed to gpgv. -.RE -.SH "DIRECTORIES" -.PP -The -Dir::State -section has directories that pertain to local state information. -lists -is the directory to place downloaded package lists in and -status -is the name of the dpkg status file. -preferences -is the name of the APT preferences file. -Dir::State -contains the default directory to prefix on all sub items if they do not start with -\fI/\fR -or -\fI./\fR. -.PP -Dir::Cache -contains locations pertaining to local cache information, such as the two package caches -srcpkgcache -and -pkgcache -as well as the location to place downloaded archives, -Dir::Cache::archives. Generation of caches can be turned off by setting their names to be blank. This will slow down startup but save disk space. It is probably prefered to turn off the pkgcache rather than the srcpkgcache. Like -Dir::State -the default directory is contained in -Dir::Cache -.PP -Dir::Etc -contains the location of configuration files, -sourcelist -gives the location of the sourcelist and -main -is the default configuration file (setting has no effect, unless it is done from the config file specified by -\fBAPT_CONFIG\fR). -.PP -The -Dir::Parts -setting reads in all the config fragments in lexical order from the directory specified. After this is done then the main config file is loaded. -.PP -Binary programs are pointed to by -Dir::Bin. -Dir::Bin::Methods -specifies the location of the method handlers and -gzip, -dpkg, -apt\-get -dpkg\-source -dpkg\-buildpackage -and -apt\-cache -specify the location of the respective programs. -.SH "APT IN DSELECT" -.PP -When APT is used as a -\fBdselect\fR(8) -method several configuration directives control the default behaviour. These are in the -DSelect -section. -.PP -Clean -.RS 3n -Cache Clean mode; this value may be one of always, prompt, auto, pre\-auto and never. always and prompt will remove all packages from the cache after upgrading, prompt (the default) does so conditionally. auto removes only those packages which are no longer downloadable (replaced with a new version for instance). pre\-auto performs this action before downloading new packages. -.RE -.PP -options -.RS 3n -The contents of this variable is passed to -\fBapt\-get\fR(8) -as command line options when it is run for the install phase. -.RE -.PP -Updateoptions -.RS 3n -The contents of this variable is passed to -\fBapt\-get\fR(8) -as command line options when it is run for the update phase. -.RE -.PP -PromptAfterUpdate -.RS 3n -If true the [U]pdate operation in -\fBdselect\fR(8) -will always prompt to continue. The default is to prompt only on error. -.RE -.SH "HOW APT CALLS DPKG" -.PP -Several configuration directives control how APT invokes -\fBdpkg\fR(8). These are in the -DPkg -section. -.PP -options -.RS 3n -This is a list of options to pass to dpkg. The options must be specified using the list notation and each list item is passed as a single argument to -\fBdpkg\fR(8). -.RE -.PP -Pre\-Invoke, Post\-Invoke -.RS 3n -This is a list of shell commands to run before/after invoking -\fBdpkg\fR(8). Like -options -this must be specified in list notation. The commands are invoked in order using -\fI/bin/sh\fR, should any fail APT will abort. -.RE -.PP -Pre\-Install\-Pkgs -.RS 3n -This is a list of shell commands to run before invoking dpkg. Like -options -this must be specified in list notation. The commands are invoked in order using -\fI/bin/sh\fR, should any fail APT will abort. APT will pass to the commands on standard input the filenames of all .deb files it is going to install, one per line. -.sp -Version 2 of this protocol dumps more information, including the protocol version, the APT configuration space and the packages, files and versions being changed. Version 2 is enabled by setting -DPkg::Tools::options::cmd::Version -to 2. -cmd -is a command given to -Pre\-Install\-Pkgs. -.RE -.PP -Run\-Directory -.RS 3n -APT chdirs to this directory before invoking dpkg, the default is -\fI/\fR. -.RE -.PP -Build\-options -.RS 3n -These options are passed to -\fBdpkg\-buildpackage\fR(1) -when compiling packages, the default is to disable signing and produce all binaries. -.RE -.SH "DEBUG OPTIONS" -.PP -Most of the options in the -debug -section are not interesting to the normal user, however -Debug::pkgProblemResolver -shows interesting output about the decisions dist\-upgrade makes. -Debug::NoLocking -disables file locking so APT can do some operations as non\-root and -Debug::pkgDPkgPM -will print out the command line for each dpkg invokation. -Debug::IdentCdrom -will disable the inclusion of statfs data in CDROM IDs. -Debug::Acquire::gpgv -Debugging of the gpgv method. -.SH "EXAMPLES" -.PP -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -is a configuration file showing example values for all possible options. -.SH "FILES" -.PP -\fI/etc/apt/apt.conf\fR -.SH "SEE ALSO" -.PP -\fBapt\-cache\fR(8), -\fBapt\-config\fR(8), -\fBapt_preferences\fR(5). -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 43f3368..74966c5 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -12,10 +12,16 @@ &apt-author.jgunthorpe; &apt-author.team; + + Daniel + Burrows + Initial documentation of Debug::*. + dburrows@debian.org + &apt-email; &apt-product; - 29 February 2004 + 10 December 2008 @@ -46,9 +52,10 @@ the APT tool group, for the Get tool. options do not inherit from their parent groups. - Syntacticly the configuration language is modeled after what the ISC tools - such as bind and dhcp use. Lines starting with - // are treated as comments (ignored). + Syntactically the configuration language is modeled after what the ISC tools + such as bind and dhcp use. Lines starting with + // are treated as comments (ignored), as well as all text + between /* and */, just like C/C++ comments. Each line is of the form APT::Get::Assume-Yes "true"; The trailing semicolon is required and the quotes are optional. A new scope can be @@ -75,6 +82,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; &docdir;examples/apt.conf &configureindex; is a good guide for how it should look. + The names of the configuration items are not case-sensitive. So in the previous example + you could use dpkg::pre-install-pkgs. + Two specials are allowed, #include and #clear #include will include the given file, unless the filename ends in a slash, then the whole directory is included. @@ -98,6 +108,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; compiled for. + Default-Release + Default release to install packages from if more than one + version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;. + + Ignore-Hold Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. @@ -158,6 +173,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. + PDiffs + Try do download deltas called PDiffs for + Packages or Sources files instead of downloading whole ones. True + by default. + + Queue-Mode Queuing mode; Queue-Mode can be one of host or access which determines how APT parallelizes outgoing @@ -206,6 +227,29 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; require this are in violation of RFC 2068. + https + HTTPS URIs. Cache-control and proxy options are the same as for + http method. + Pipeline-Depth option is not supported yet. + + CaInfo suboption specifies place of file that + holds info about trusted certificates. + <host>::CaInfo is corresponding per-host option. + Verify-Peer boolean suboption determines whether verify + server's host certificate against trusted certificates or not. + <host>::Verify-Peer is corresponding per-host option. + Verify-Host boolean suboption determines whether verify + server's hostname or not. + <host>::Verify-Host is corresponding per-host option. + SslCert determines what certificate to use for client + authentication. <host>::SslCert is corresponding per-host option. + SslKey determines what private key to use for client + authentication. <host>::SslKey is corresponding per-host option. + SslForceVersion overrides default SSL version to use. + Can contain 'TLSv1' or 'SSLv3' string. + <host>::SslForceVersion is corresponding per-host option. + + ftp FTP URIs; ftp::Proxy is the default proxy server to use. It is in the standard form of ftp://[[user][:pass]@]host[:port]/ and is @@ -214,7 +258,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; configuration file. This entry specifies the commands to send to tell the proxy server what to connect to. Please see &configureindex; for an example of - how to do this. The subsitution variables available are + how to do this. The substitution variables available are $(PROXY_USER) $(PROXY_PASS) $(SITE_USER) $(SITE_PASS) $(SITE) and $(SITE_PORT) Each is taken from it's respective URI component. @@ -235,7 +279,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; not recommended to use FTP over HTTP due to its low efficiency. The setting ForceExtended controls the use of RFC2428 - EPSV and EPRT commands. The defaut is false, which means + EPSV and EPRT commands. The default is false, which means these commands are only used if the control connection is IPv6. Setting this to true forces their use even on IPv4 connections. Note that most FTP servers do not support RFC2428. @@ -276,7 +320,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; pkgcache as well as the location to place downloaded archives, Dir::Cache::archives. Generation of caches can be turned off by setting their names to be blank. This will slow down startup but - save disk space. It is probably prefered to turn off the pkgcache rather + save disk space. It is probably preferred to turn off the pkgcache rather than the srcpkgcache. Like Dir::State the default directory is contained in Dir::Cache @@ -295,6 +339,19 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; dpkg, apt-get dpkg-source dpkg-buildpackage and apt-cache specify the location of the respective programs. + + + The configuration item RootDir has a special + meaning. If set, all paths in Dir:: will be + relative to RootDir, even paths that + are specified absolutely. So, for instance, if + RootDir is set to + /tmp/staging and + Dir::State::status is set to + /var/lib/dpkg/status, then the status file + will be looked up in + /tmp/staging/var/lib/dpkg/status. + APT in DSelect @@ -373,16 +430,353 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - Debug options - Most of the options in the debug section are not interesting to - the normal user, however Debug::pkgProblemResolver shows - interesting output about the decisions dist-upgrade makes. - Debug::NoLocking disables file locking so APT can do some - operations as non-root and Debug::pkgDPkgPM will print out the - command line for each dpkg invokation. Debug::IdentCdrom will - disable the inclusion of statfs data in CDROM IDs. - Debug::Acquire::gpgv Debugging of the gpgv method. + + Periodic and Archives options + APT::Periodic and APT::Archives + groups of options configure behavior of apt periodic updates, which is + done by /etc/cron.daily/apt script. See header of + this script for the brief documentation of these options. + + + + + Debug options + + Enabling options in the Debug:: section will + cause debugging information to be sent to the standard error + stream of the program utilizing the apt + libraries, or enable special program modes that are primarily + useful for debugging the behavior of apt. + Most of these options are not interesting to a normal user, but a + few may be: + + + + + Debug::pkgProblemResolver enables output + about the decisions made by + dist-upgrade, upgrade, install, remove, purge. + + + + + + Debug::NoLocking disables all file + locking. This can be used to run some operations (for + instance, apt-get -s install) as a + non-root user. + + + + + + Debug::pkgDPkgPM prints out the actual + command line each time that apt invokes + &dpkg;. + + + + + + Debug::IdentCdrom disables the inclusion + of statfs data in CDROM IDs. + + + + + + A full list of debugging options to apt follows. + + + + + Debug::Acquire::cdrom + + + + Print information related to accessing + cdrom:// sources. + + + + + + Debug::Acquire::ftp + + + + Print information related to downloading packages using + FTP. + + + + + + Debug::Acquire::http + + + + Print information related to downloading packages using + HTTP. + + + + + + Debug::Acquire::https + + + + Print information related to downloading packages using + HTTPS. + + + + + + Debug::Acquire::gpgv + + + + Print information related to verifying cryptographic + signatures using gpg. + + + + + + Debug::aptcdrom + + + + Output information about the process of accessing + collections of packages stored on CD-ROMs. + + + + + + Debug::BuildDeps + + + Describes the process of resolving build-dependencies in + &apt-get;. + + + + + + Debug::Hashes + + + Output each cryptographic hash that is generated by the + apt libraries. + + + + + + Debug::IdentCDROM + + + Do not include information from statfs, + namely the number of used and free blocks on the CD-ROM + filesystem, when generating an ID for a CD-ROM. + + + + + + Debug::NoLocking + + + Disable all file locking. For instance, this will allow + two instances of apt-get + update to run at the same time. + + + + + + Debug::pkgAcquire + + + + Log when items are added to or removed from the global + download queue. + + + + + + Debug::pkgAcquire::Auth + + + Output status messages and errors related to verifying + checksums and cryptographic signatures of downloaded files. + + + + + + Debug::pkgAcquire::Diffs + + + Output information about downloading and applying package + index list diffs, and errors relating to package index list + diffs. + + + + + + Debug::pkgAcquire::RRed + + + + Output information related to patching apt package lists + when downloading index diffs instead of full indices. + + + + + + Debug::pkgAcquire::Worker + + + + Log all interactions with the sub-processes that actually + perform downloads. + + + + + + Debug::pkgAutoRemove + + + + Log events related to the automatically-installed status of + packages and to the removal of unused packages. + + + + + + Debug::pkgDepCache::AutoInstall + + + Generate debug messages describing which packages are being + automatically installed to resolve dependencies. This + corresponds to the initial auto-install pass performed in, + e.g., apt-get install, and not to the + full apt dependency resolver; see + Debug::pkgProblemResolver for that. + + + + + + + Debug::pkgInitConfig + + + Dump the default configuration to standard output on + startup. + + + + + + Debug::pkgDPkgPM + + + When invoking &dpkg;, output the precise command line with + which it is being invoked, with arguments separated by a + single space character. + + + + + + Debug::pkgDPkgProgressReporting + + + Output all the data received from &dpkg; on the status file + descriptor and any errors encountered while parsing it. + + + + + + Debug::pkgOrderList + + + + Generate a trace of the algorithm that decides the order in + which apt should pass packages to + &dpkg;. + + + + + + Debug::pkgPackageManager + + + + Output status messages tracing the steps performed when + invoking &dpkg;. + + + + + + Debug::pkgPolicy + + + + Output the priority of each package list on startup. + + + + + + Debug::pkgProblemResolver + + + + Trace the execution of the dependency resolver (this + applies only to what happens when a complex dependency + problem is encountered). + + + + + + Debug::sourceList + + + + Print information about the vendors read from + /etc/apt/vendors.list. + + + + + + Debug::Vendor + + + + Print information about each vendor. + + + + Examples diff --git a/doc/apt.ent b/doc/apt.ent index 99fe443..4cfc000 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -57,8 +57,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > @@ -141,14 +141,26 @@ 1 " > - + + + gnome-apt + 1 + " +> + + + wajig + 1 + " +> +
apt@packages.debian.org
Jason Gunthorpe 1998-2001 Jason Gunthorpe - 14 December 2003 + 28 October 2008 Linux @@ -167,6 +179,13 @@ "> + + Mike + O'Connor + +"> + APT team @@ -207,6 +226,12 @@ Linux "> + + QA Page + +"> + Bugs @@ -257,8 +282,10 @@ - Set a Configuration Option; This will set an arbitary + Set a Configuration Option; This will set an arbitrary configuration option. The syntax is . + and can be used multiple + times to set different options. diff --git a/doc/apt_preferences.5 b/doc/apt_preferences.5 deleted file mode 100644 index afad729..0000000 --- a/doc/apt_preferences.5 +++ /dev/null @@ -1,532 +0,0 @@ -.\" Title: apt_preferences -.\" Author: APT team -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "APT_PREFERENCES" "5" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -apt_preferences \- Preference control file for APT -.SH "DESCRIPTION" -.PP -The APT preferences file -\fI/etc/apt/preferences\fR -can be used to control which versions of packages will be selected for installation. -.PP -Several versions of a package may be available for installation when the -\fBsources.list\fR(5) -file contains references to more than one distribution (for example, -stable -and -testing). APT assigns a priority to each version that is available. Subject to dependency constraints, -\fBapt\-get\fR -selects the version with the highest priority for installation. The APT preferences file overrides the priorities that APT assigns to package versions by default, thus giving the user control over which one is selected for installation. -.PP -Several instances of the same version of a package may be available when the -\fBsources.list\fR(5) -file contains references to more than one source. In this case -\fBapt\-get\fR -downloads the instance listed earliest in the -\fBsources.list\fR(5) -file. The APT preferences file does not affect the choice of instance, only the choice of version. -.SS "APT's Default Priority Assignments" -.PP -If there is no preferences file or if there is no entry in the file that applies to a particular version then the priority assigned to that version is the priority of the distribution to which that version belongs. It is possible to single out a distribution, "the target release", which receives a higher priority than other distributions do by default. The target release can be set on the -\fBapt\-get\fR -command line or in the APT configuration file -\fI/etc/apt/apt.conf\fR. For example, -.sp -.RS 3n -.nf -\fBapt\-get install \-t testing \fR\fB\fIsome\-package\fR\fR -.fi -.RE -.sp - -.sp -.RS 3n -.nf -APT::Default\-Release "stable"; -.fi -.RE -.sp -.PP -If the target release has been specified then APT uses the following algorithm to set the priorities of the versions of a package. Assign: -.PP -priority 100 -.RS 3n -to the version that is already installed (if any). -.RE -.PP -priority 500 -.RS 3n -to the versions that are not installed and do not belong to the target release. -.RE -.PP -priority 990 -.RS 3n -to the versions that are not installed and belong to the target release. -.RE -.PP -If the target release has not been specified then APT simply assigns priority 100 to all installed package versions and priority 500 to all uninstalled package versions. -.PP -APT then applies the following rules, listed in order of precedence, to determine which version of a package to install. -.TP 3n -\(bu -Never downgrade unless the priority of an available version exceeds 1000. ("Downgrading" is installing a less recent version of a package in place of a more recent version. Note that none of APT's default priorities exceeds 1000; such high priorities can only be set in the preferences file. Note also that downgrading a package can be risky.) -.TP 3n -\(bu -Install the highest priority version. -.TP 3n -\(bu -If two or more versions have the same priority, install the most recent one (that is, the one with the higher version number). -.TP 3n -\(bu -If two or more versions have the same priority and version number but either the packages differ in some of their metadata or the -\-\-reinstall -option is given, install the uninstalled one. -.sp -.RE -.PP -In a typical situation, the installed version of a package (priority 100) is not as recent as one of the versions available from the sources listed in the -\fBsources.list\fR(5) -file (priority 500 or 990). Then the package will be upgraded when -\fBapt\-get install \fR\fB\fIsome\-package\fR\fR -or -\fBapt\-get upgrade\fR -is executed. -.PP -More rarely, the installed version of a package is -\fImore\fR -recent than any of the other available versions. The package will not be downgraded when -\fBapt\-get install \fR\fB\fIsome\-package\fR\fR -or -\fBapt\-get upgrade\fR -is executed. -.PP -Sometimes the installed version of a package is more recent than the version belonging to the target release, but not as recent as a version belonging to some other distribution. Such a package will indeed be upgraded when -\fBapt\-get install \fR\fB\fIsome\-package\fR\fR -or -\fBapt\-get upgrade\fR -is executed, because at least -\fIone\fR -of the available versions has a higher priority than the installed version. -.SS "The Effect of APT Preferences" -.PP -The APT preferences file allows the system administrator to control the assignment of priorities. The file consists of one or more multi\-line records separated by blank lines. Records can have one of two forms, a specific form and a general form. -.TP 3n -\(bu -The specific form assigns a priority (a "Pin\-Priority") to a specified package and specified version or version range. For example, the following record assigns a high priority to all versions of the -\fIperl\fR -package whose version number begins with "5.8". -.sp -.RS 3n -.nf -Package: perl -Pin: version 5.8* -Pin\-Priority: 1001 -.fi -.RE -.TP 3n -\(bu -The general form assigns a priority to all of the package versions in a given distribution (that is, to all the versions of packages that are listed in a certain -\fIRelease\fR -file) or to all of the package versions coming from a particular Internet site, as identified by the site's fully qualified domain name. -.sp -This general\-form entry in the APT preferences file applies only to groups of packages. For example, the following record assigns a high priority to all package versions available from the local site. -.sp -.RS 3n -.nf -Package: * -Pin: origin "" -Pin\-Priority: 999 -.fi -.RE -A note of caution: the keyword used here is "origin". This should not be confused with the Origin of a distribution as specified in a -\fIRelease\fR -file. What follows the "Origin:" tag in a -\fIRelease\fR -file is not an Internet address but an author or vendor name, such as "Debian" or "Ximian". -.sp -The following record assigns a low priority to all package versions belonging to any distribution whose Archive name is "unstable". -.sp -.RS 3n -.nf -Package: * -Pin: release a=unstable -Pin\-Priority: 50 -.fi -.RE -The following record assigns a high priority to all package versions belonging to any release whose Archive name is "stable" and whose release Version number is "3.0". -.sp -.RS 3n -.nf -Package: * -Pin: release a=stable, v=3.0 -Pin\-Priority: 500 -.fi -.RE -.sp -.RE -.SS "How APT Interprets Priorities" -.PP -Priorities (P) assigned in the APT preferences file must be positive or negative integers. They are interpreted as follows (roughly speaking): -.PP -P > 1000 -.RS 3n -causes a version to be installed even if this constitutes a downgrade of the package -.RE -.PP -990 < P <=1000 -.RS 3n -causes a version to be installed even if it does not come from the target release, unless the installed version is more recent -.RE -.PP -500 < P <=990 -.RS 3n -causes a version to be installed unless there is a version available belonging to the target release or the installed version is more recent -.RE -.PP -100 < P <=500 -.RS 3n -causes a version to be installed unless there is a version available belonging to some other distribution or the installed version is more recent -.RE -.PP -0 < P <=100 -.RS 3n -causes a version to be installed only if there is no installed version of the package -.RE -.PP -P < 0 -.RS 3n -prevents the version from being installed -.RE -.PP -If any specific\-form records match an available package version then the first such record determines the priority of the package version. Failing that, if any general\-form records match an available package version then the first such record determines the priority of the package version. -.PP -For example, suppose the APT preferences file contains the three records presented earlier: -.sp -.RS 3n -.nf -Package: perl -Pin: version 5.8* -Pin\-Priority: 1001 - -Package: * -Pin: origin "" -Pin\-Priority: 999 - -Package: * -Pin: release unstable -Pin\-Priority: 50 -.fi -.RE -.PP -Then: -.TP 3n -\(bu -The most recent available version of the -perl -package will be installed, so long as that version's version number begins with "5.8". If -\fIany\fR -5.8* version of -perl -is available and the installed version is 5.9*, then -perl -will be downgraded. -.TP 3n -\(bu -A version of any package other than -perl -that is available from the local system has priority over other versions, even versions belonging to the target release. -.TP 3n -\(bu -A version of a package whose origin is not the local system but some other site listed in -\fBsources.list\fR(5) -and which belongs to an -unstable -distribution is only installed if it is selected for installation and no version of the package is already installed. -.sp -.RE -.SS "Determination of Package Version and Distribution Properties" -.PP -The locations listed in the -\fBsources.list\fR(5) -file should provide -\fIPackages\fR -and -\fIRelease\fR -files to describe the packages available at that location. -.PP -The -\fIPackages\fR -file is normally found in the directory -\fI.../dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR: for example, -\fI.../dists/stable/main/binary\-i386/Packages\fR. It consists of a series of multi\-line records, one for each package available in that directory. Only two lines in each record are relevant for setting APT priorities: -.PP -the Package: line -.RS 3n -gives the package name -.RE -.PP -the Version: line -.RS 3n -gives the version number for the named package -.RE -.PP -The -\fIRelease\fR -file is normally found in the directory -\fI.../dists/\fR\fI\fIdist\-name\fR\fR: for example, -\fI.../dists/stable/Release\fR, or -\fI.../dists/woody/Release\fR. It consists of a single multi\-line record which applies to -\fIall\fR -of the packages in the directory tree below its parent. Unlike the -\fIPackages\fR -file, nearly all of the lines in a -\fIRelease\fR -file are relevant for setting APT priorities: -.PP -the Archive: line -.RS 3n -names the archive to which all the packages in the directory tree belong. For example, the line "Archive: stable" specifies that all of the packages in the directory tree below the parent of the -\fIRelease\fR -file are in a -stable -archive. Specifying this value in the APT preferences file would require the line: -.sp -.RS 3n -.nf -Pin: release a=stable -.fi -.RE -.RE -.PP -the Version: line -.RS 3n -names the release version. For example, the packages in the tree might belong to Debian GNU/Linux release version 3.0. Note that there is normally no version number for the -testing -and -unstable -distributions because they have not been released yet. Specifying this in the APT preferences file would require one of the following lines. -.sp -.RS 3n -.nf -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 -.fi -.RE -.RE -.PP -the Component: line -.RS 3n -names the licensing component associated with the packages in the directory tree of the -\fIRelease\fR -file. For example, the line "Component: main" specifies that all the packages in the directory tree are from the -main -component, which entails that they are licensed under terms listed in the Debian Free Software Guidelines. Specifying this component in the APT preferences file would require the line: -.sp -.RS 3n -.nf -Pin: release c=main -.fi -.RE -.RE -.PP -the Origin: line -.RS 3n -names the originator of the packages in the directory tree of the -\fIRelease\fR -file. Most commonly, this is -Debian. Specifying this origin in the APT preferences file would require the line: -.sp -.RS 3n -.nf -Pin: release o=Debian -.fi -.RE -.RE -.PP -the Label: line -.RS 3n -names the label of the packages in the directory tree of the -\fIRelease\fR -file. Most commonly, this is -Debian. Specifying this label in the APT preferences file would require the line: -.sp -.RS 3n -.nf -Pin: release l=Debian -.fi -.RE -.RE -.PP -All of the -\fIPackages\fR -and -\fIRelease\fR -files retrieved from locations listed in the -\fBsources.list\fR(5) -file are stored in the directory -\fI/var/lib/apt/lists\fR, or in the file named by the variable -Dir::State::Lists -in the -\fIapt.conf\fR -file. For example, the file -\fIdebian.lcs.mit.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR -contains the -\fIRelease\fR -file retrieved from the site -debian.lcs.mit.edu -for -binary\-i386 -architecture files from the -contrib -component of the -unstable -distribution. -.SS "Optional Lines in an APT Preferences Record" -.PP -Each record in the APT preferences file can optionally begin with one or more lines beginning with the word -Explanation:. This provides a place for comments. -.PP -The -Pin\-Priority: -line in each APT preferences record is optional. If omitted, APT assigs a priority of 1 less than the last value specified on a line beginning with -Pin\-Priority: release .... -.SH "EXAMPLES" -.SS "Tracking Stable" -.PP -The following APT preferences file will cause APT to assign a priority higher than the default (500) to all package versions belonging to a -stable -distribution and a prohibitively low priority to package versions belonging to other -Debian -distributions. -.sp -.RS 3n -.nf -Explanation: Uninstall or do not install any Debian\-originated -Explanation: package versions other than those in the stable distro -Package: * -Pin: release a=stable -Pin\-Priority: 900 - -Package: * -Pin: release o=Debian -Pin\-Priority: \-10 -.fi -.RE -.sp -.PP -With a suitable -\fBsources.list\fR(5) -file and the above preferences file, any of the following commands will cause APT to upgrade to the latest -stable -version(s). -.sp -.RS 3n -.nf -apt\-get install \fIpackage\-name\fR -apt\-get upgrade -apt\-get dist\-upgrade -.fi -.RE -.sp -.PP -The following command will cause APT to upgrade the specified package to the latest version from the -testing -distribution; the package will not be upgraded again unless this command is given again. -.sp -.RS 3n -.nf -apt\-get install \fIpackage\fR/testing -.fi -.RE -.sp -.SS "Tracking Testing or Unstable" -.PP -The following APT preferences file will cause APT to assign a high priority to package versions from the -testing -distribution, a lower priority to package versions from the -unstable -distribution, and a prohibitively low priority to package versions from other -Debian -distributions. -.sp -.RS 3n -.nf -Package: * -Pin: release a=testing -Pin\-Priority: 900 - -Package: * -Pin: release a=unstable -Pin\-Priority: 800 - -Package: * -Pin: release o=Debian -Pin\-Priority: \-10 -.fi -.RE -.sp -.PP -With a suitable -\fBsources.list\fR(5) -file and the above preferences file, any of the following commands will cause APT to upgrade to the latest -testing -version(s). -.sp -.RS 3n -.nf -apt\-get install \fIpackage\-name\fR -apt\-get upgrade -apt\-get dist\-upgrade -.fi -.RE -.sp -.PP -The following command will cause APT to upgrade the specified package to the latest version from the -unstable -distribution. Thereafter, -\fBapt\-get upgrade\fR -will upgrade the package to the most recent -testing -version if that is more recent than the installed version, otherwise, to the most recent -unstable -version if that is more recent than the installed version. -.sp -.RS 3n -.nf -apt\-get install \fIpackage\fR/unstable -.fi -.RE -.sp -.SH "SEE ALSO" -.PP -\fBapt\-get\fR(8) -\fBapt\-cache\fR(8) -\fBapt.conf\fR(5) -\fBsources.list\fR(5) -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHOR" -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3e50bef..162c2f0 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -60,6 +60,9 @@ belongs. It is possible to single out a distribution, "the target release", which receives a higher priority than other distributions do by default. The target release can be set on the apt-get command line or in the APT configuration file /etc/apt/apt.conf. +Note that this has precedence over any general priority you set in the +/etc/apt/preferences file described later, but not +over specifically pinned packages. For example, @@ -143,10 +146,11 @@ separated by blank lines. Records can have one of two forms, a specific form and a general form. -The specific form assigns a priority (a "Pin-Priority") to a -specified package and specified version or version range. For example, +The specific form assigns a priority (a "Pin-Priority") to one or more +specified packages and specified version or version range. For example, the following record assigns a high priority to all versions of -the perl package whose version number begins with "5.8". +the perl package whose version number begins with "5.8". +Multiple packages can be separated by spaces. Package: perl @@ -421,7 +425,7 @@ one or more lines beginning with the word Explanation:. This provides a place for comments. The Pin-Priority: line in each APT preferences record is -optional. If omitted, APT assigs a priority of 1 less than the last value +optional. If omitted, APT assigns a priority of 1 less than the last value specified on a line beginning with Pin-Priority: release .... diff --git a/doc/cache.sgml b/doc/cache.sgml index aa87db9..aea5a45 100644 --- a/doc/cache.sgml +++ b/doc/cache.sgml @@ -492,7 +492,7 @@ This is the parsed priority value of the package. Dependency contains the information for a single dependency record. The records are split up like this to ease processing by the client. The base of list linked list is Version.DependsList. All forms of dependencies are recorded -here including Conflicts, Suggests and Recommends. +here including Conflicts, Breaks, Suggests and Recommends.

Multiple depends on the same package must be grouped together in @@ -671,6 +671,7 @@ of them. #define pkgDEP_Recommends 4 #define pkgDEP_Conflicts 5 #define pkgDEP_Replaces 6 +#define pkgDEP_Breaks 8 @@ -720,6 +721,8 @@ or'd with the current package. #define pkgSTATE_HalfInstalled 4 #define pkgSTATE_ConfigFiles 5 #define pkgSTATE_Installed 6 +#define pkgSTATE_TriggersAwaited 7 +#define pkgSTATE_TriggersPending 8 diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml index 23372d7..7c6e023 100644 --- a/doc/dpkg-tech.sgml +++ b/doc/dpkg-tech.sgml @@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:- productivity of the package Conflicts, to specify a package which must NOT be installed in order for the package to be configured + Breaks, to specify a package which is broken by the + package and which should therefore not be configured while broken Each of these dependencies can specify a version and a depedency on that version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore deleted file mode 100644 index ce36346..0000000 --- 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/es/apt-cache.es.8 b/doc/es/apt-cache.es.8 index 05a1f4b..10ff0a6 100644 --- a/doc/es/apt-cache.es.8 +++ b/doc/es/apt-cache.es.8 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT-CACHE" "8" "04 December 2006" "" "" +.TH "APT-CACHE" "8" "20 January 2009" "" "" .SH NAME apt-cache \- utilidad de manejo de paquetes APT -- manipulador de caché diff --git a/doc/es/apt-cdrom.es.8 b/doc/es/apt-cdrom.es.8 index dbf7b68..44bff4c 100644 --- a/doc/es/apt-cdrom.es.8 +++ b/doc/es/apt-cdrom.es.8 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT-CDROM" "8" "04 December 2006" "" "" +.TH "APT-CDROM" "8" "20 January 2009" "" "" .SH NAME apt-cdrom \- utilidad APT para administración del CDROM diff --git a/doc/es/apt-config.es.8 b/doc/es/apt-config.es.8 index 4979c03..94369af 100644 --- a/doc/es/apt-config.es.8 +++ b/doc/es/apt-config.es.8 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT-CONFIG" "8" "04 December 2006" "" "" +.TH "APT-CONFIG" "8" "20 January 2009" "" "" .SH NAME apt-config \- Programa para la consulta de configuración de APT diff --git a/doc/es/apt-get.es.8 b/doc/es/apt-get.es.8 index 3c859ce..548a7a9 100644 --- a/doc/es/apt-get.es.8 +++ b/doc/es/apt-get.es.8 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT-GET" "8" "04 December 2006" "" "" +.TH "APT-GET" "8" "20 January 2009" "" "" .SH NAME apt-get \- utilidad de manejo de paquetes APT -- interfaz en línea de ordenes. diff --git a/doc/es/apt.conf.es.5 b/doc/es/apt.conf.es.5 index f73b4c7..32b525a 100644 --- a/doc/es/apt.conf.es.5 +++ b/doc/es/apt.conf.es.5 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT.CONF" "5" "04 December 2006" "" "" +.TH "APT.CONF" "5" "20 January 2009" "" "" .SH NAME apt.conf \- Archivo de configuración de APT diff --git a/doc/es/apt_preferences.es.5 b/doc/es/apt_preferences.es.5 index d8a9867..e388ab2 100644 --- a/doc/es/apt_preferences.es.5 +++ b/doc/es/apt_preferences.es.5 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT_PREFERENCES" "5" "04 December 2006" "" "" +.TH "APT_PREFERENCES" "5" "20 January 2009" "" "" .SH NAME apt_preferences \- Fichero de preferencias de APT diff --git a/doc/es/sources.list.es.5 b/doc/es/sources.list.es.5 index 89a58e1..5fef07f 100644 --- a/doc/es/sources.list.es.5 +++ b/doc/es/sources.list.es.5 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "SOURCES.LIST" "5" "04 December 2006" "" "" +.TH "SOURCES.LIST" "5" "20 January 2009" "" "" .SH NAME sources.list \- lista de recursos de paquetes para APT diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf new file mode 100644 index 0000000..0067171 --- /dev/null +++ b/doc/examples/apt-https-method-example.conf @@ -0,0 +1,165 @@ +/* This file is a sample configuration for apt https method. Configuration + parameters found in this example file are expected to be used in main + apt.conf file, just like other configuration parameters for different + methods (ftp, file, ...). + + This example file starts with a common setup that voluntarily exhibits + all available configurations knobs with simple comments. Extended + comments on the behavior of the option is provided at the end for + better readibility. As a matter of fact, a common configuration file + will certainly contain far less elements and benefit of default values + for many parameters. + + Because some configuration parameters for apt https method in following + examples apply to specific (fictional) repositories, the associated + sources.list file is provided here: + + ... + + deb https://secure.dom1.tld/debian unstable main contrib non-free + deb-src https://secure.dom1.tld/debian unstable main contrib non-free + + deb https://secure.dom2.tld/debian unstable main contrib non-free + deb-src https://secure.dom2.tld/debian unstable main contrib non-free + + ... + + + Some notes on the servers: + + - secure.dom1.tld is freely accessible using https (no client + authentication is required). + - secure.dom1.tld certificate is part of a multi level PKI, and we + want to specifically check the issuer of its certificate. We do + not have the constraint for secure.dom2.tld + - secure.dom2.tld requires client authentication by certificate + to access its content. + - The certificate presented by both server have (as expected) a CN that + matches their respective DNS names. + - It somtimes happens that we had other more generic https available + repository to our list. We want the checks to be performed against + a common list of anchors (like the one provided by ca-certificates + package for instance) + + The sample configuration below basically covers those simpe needs. +*/ + + +// Verify peer certificate and also matching between certificate name +// and server name as provided in sources.list (default values) +Acquire::https::Verify-Peer "true"; +Acquire::https::Verify-Host "true"; + +// Except otherwise specified, use that list of anchors +Acquire::https::CaInfo "/etc/ssl/certs/ca-certificates.pem"; + +// Use a specific anchor and associated CRL. Enforce issuer of +// server certificate using its cert. +Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem"; + +// Like previous for anchor and CRL, but also provide our +// certificate and keys for client authentication. +Acquire::https::secure.dom2.tld::CaInfo "/etc/apt/certs/ca-dom2-crt.pem"; +Acquire::https::secure.dom2.tld::SslCert "/etc/apt/certs/my-crt.pem"; +Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; + +// No need to downgrade, TLS will be proposed by default. Uncomment +// to have SSLv3 proposed. +// Acquire::https::mirror.ipv6.ssi.corp::SslForceVersion "SSLv3"; + +// No need for more debug if every is fine (default). Uncomment +// me to get additional information. +// Debug::Acquire::https "true"; + + +/* + Options with extended comments: + + Acquire::https[::repo.domain.tld]::CaInfo "/path/to/ca/certs.pem"; + + A string providing the path of a file containing the list of trusted + CA certificates used to verify the server certificate. The pointed + file is made of the concatenation of the CA certificates (in + PEM format) creating the chain used for the verification of the path + from the root (self signed one). If the remote server provides the + whole chain during the exchange, the file need only contain the root + certificate. Otherwise, the whole chain is required. + + If you need to support multiple authorities, the only way is to + concatenate everything. + + If None is provided, the default CA bundle used by GnuTLS (apt https + method is linked against libcurl-gnutls) is used. At the time of + writing, /etc/ssl/certs/ca-certificates.crt. + + If no specific hostname is provided, the file is used by default + for all https targets. If a specific mirror is provided, it is + used for the https entries in the sources.list file that use that + repository (with the same name). + + Acquire::https[::repo.domain.tld]::Verify-Peer "true"; + + When authenticating the server, if the certificate verification fails + for some reason (expired, revoked, man in the middle, lack of anchor, + ...), the connection fails. This is obviously what you want in all + cases and what the default value (true) of this option provides. + + If you know EXACTLY what you are doing, setting this option to "false" + allow you to skip peer certificate verification and make the exchange + succeed. Again, this option is for debugging or testing purpose only. + It removes ALL the security provided by the use of SSL.TLS to secure + the HTTP exchanges. + + Acquire::https[::repo.domain.tld]::Verify-Host "true"; + + The certificate provided by the server during the TLS/SSL exchange + provides the identity of the server which should match the DNS name + used to access it. By default, as requested by RFC 2818, the name + of the mirror is checked against the identity found in the + certificate. This default behavior is safe and should not be + changed. If you know that the server you are using has a DNS name + which does not match the identity in its certificate, you can + [report that issue to its administrator or] set the option to + "false", which will prevent the comparison to be done. + + The options can be set globally or on a per-mirror basis. If set + globally, the DNS name used is the one found in the sources.list + file in the https URI. + + Acquire::https[::repo.domain.tld]::SslCert "/path/to/client/cert.pem"; + Acquire::https[::repo.domain.tld]::SslKey "/path/to/client/key.pem"; + + These two options provides support for client authentication using + certificates. They respectively accept the X.509 client certificate + in PEM format and the associated client key in PEM format (non + encrypted form). + + The options can be set globally (which rarely makes sense) or on a + per-mirror basis. + + Acquire::https[::repo.domain.tld]::SslForceVersion "TLSv1"; + + This option can be use to select the version which will be proposed + to the server. "SSLv3" and "TLSv1" are supported. SSLv2, which is + considered insecure anyway is not supported (by gnutls, which is + used by libcurl against which apt https method is linked). + + When the option is set to "SSLv3" to have apt propose SSLv3 (and + associated sets of ciphersuites) instead of TLSv1 (the default) + when performing the exchange. This prevents the server to select + TLSv1 and use associated cipheruites. You should probably not use + this option except if you know exactly what you are doing. + + Note that the default setting does not guarantee that the server + will not select SSLv3 (for ciphersuites and SSL/TLS version as + selectio is always done by the server, in the end). It only means + that apt will not advertise TLS support. + + Debug::Acquire::https "true"; + + This option can be used to show debug information. Because it is + quite verbose, it is mainly useful to debug problems in case of + failure to connect to a server for some reason. The default value + is "false". + +*/ diff --git a/doc/examples/configure-index b/doc/examples/configure-index index e58ba7b..db07f18 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,8 +1,7 @@ -// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default - values, unless you have specific needs you should NOT include arbitary + values, unless you have specific needs you should NOT include arbitrary items in a custom configuration. In some instances involving filenames it is possible to set the default @@ -24,11 +23,17 @@ APT { Architecture "i386"; Build-Essential "build-essential"; - + + NeverAutoRemove { "linux-image.*"; }; // packages that should never + // considered for autoRemove + // Options for apt-get Get { Arch-Only "false"; + AllowUnauthenticated "false"; + AutomaticRemove "false"; + HideAutoRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@ -49,6 +54,7 @@ APT Only-Source ""; Diff-Only "false"; Tar-Only "false"; + Build-Dep-Automatic "true"; }; Cache @@ -72,6 +78,12 @@ APT NoAct "false"; }; + Update + { + Pre-Invoke {"touch /var/lib/apt/pre-update-stamp"; }; + Post-Invoke {"touch /var/lib/apt/post-update-stamp"; }; + }; + Authentication { TrustCDROM "false"; // consider the CDROM always trusted @@ -90,6 +102,13 @@ APT Cache-Limit "4194304"; Default-Release ""; + // consider Recommends, Suggests as important dependencies that should + // be installed by default + Install-Recommends "true"; + Install-Suggests "false"; + + // consider dependencies of packages in this section manual + Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; }; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; @@ -122,6 +141,18 @@ Acquire Dl-Limit "7"; // 7Kb/sec maximum download rate }; + // HTTPS method configuration: + // - uses the http proxy config + // - uses the http cache-control values + // - uses the http Dl-Limit values + https + { + Verify-Peer "false"; + SslCert "/etc/apt/some.pem"; + CaPath "/etc/ssl/certs"; + Verify-Host" "2"; + }; + ftp { Proxy "ftp://127.0.0.1/"; @@ -140,7 +171,7 @@ Acquire Timeout "120"; /* Passive mode control, proxy, non-proxy and per-host. Pasv mode - is prefered if possible */ + is preferred if possible */ Passive "true"; Proxy::Passive "true"; Passive::http.us.debian.org "true"; // Specific per-host setting @@ -160,7 +191,7 @@ Acquire gpgv { - Options {"--ignore-time-conflict";} // not very usefull on a normal system + Options {"--ignore-time-conflict";} // not very useful on a normal system }; }; @@ -203,6 +234,11 @@ Dir "/" apt-get "/usr/bin/apt-get"; apt-cache "/usr/bin/apt-cache"; }; + + // Location of the logfile + Log "var/log/apt" { + Terminal "term.log"; + }; }; // Things that effect the APT dselect method @@ -257,12 +293,13 @@ Debug pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; + pkgAutoRemove "false"; // show information about automatic removes BuildDeps "false"; - pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic Acquire::Http "false"; // Show http command traffic + Acquire::Https "false"; // Show https debug Acquire::gpgv "false"; // Show the gpgv traffic aptcdrom "false"; // Show found package files IdentCdrom "false"; diff --git a/doc/examples/sources.list b/doc/examples/sources.list index 9af1c3c..ef729e2 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -6,4 +6,4 @@ deb http://security.debian.org stable/updates main contrib non-free # Uncomment if you want the apt-get source function to work #deb-src http://http.us.debian.org/debian stable main contrib non-free -#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free +#deb-src http://security.debian.org stable/updates main contrib non-free diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore deleted file mode 100644 index cfa8962..0000000 --- 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/fr/apt-cache.8 b/doc/fr/apt-cache.8 index deac129..44e9ddc 100644 --- a/doc/fr/apt-cache.8 +++ b/doc/fr/apt-cache.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cache +.\" Title: apt-cache .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-cache \- Gestion des paquets et manipulation du cache par APT +apt-cache \- Gestion des paquets et manipulation du cache par APT .SH "SYNOPSIS" .HP 10 \fBapt\-cache\fR [\fB\-hvsn\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[add\ \fIfichier\fR...] | [gencaches] | [showpkg\ \fIpaquet\fR...] | [showsrc\ \fIpaquet\fR...] | [stats] | [dump] | [dumpavail] | [unmet] | [search\ \fIregex\fR] | [show\ \fIpaquet\fR...] | [depends\ \fIpaquet\fR...] | [rdepends\ \fIpaquet\fR...] | [pkgnames\ \fIprefix\fR] | [dotty\ \fIpaquet\fR...] | [policy\ \fIpaquets\fR...] | [madison\ \fIpaquets\fR...]} @@ -19,382 +19,392 @@ apt\-cache \- Gestion des paquets et manipulation du cache par APT .PP \fBapt\-cache\fR -réalise différentes opérations sur le cache de paquet d' APT. +réalise différentes opérations sur le cache de paquet d\' APT\&. \fBapt\-cache\fR -ne manipule pas l'état du système mais fournit des moyens de recherche dans les métadonnées d'un paquet desquelles il extrait d'intéressantes informations. +ne manipule pas l\'état du système mais fournit des moyens de recherche dans les métadonnées d\'un paquet desquelles il extrait d\'intéressantes informations\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP add \fIfichier(s)\fR -.RS 3n +.RS 4 La commande add -ajoute des fichiers indexant des paquets au cache des paquets. Cela sert uniquement pour le débogage. +ajoute des fichiers indexant des paquets au cache des paquets\&. Cela sert uniquement pour le débogage\&. .RE .PP gencaches -.RS 3n +.RS 4 La commande gencaches fait la même chose que -\fBapt\-get check\fR. Elle construit les caches des sources et des paquets à partir des sources répertoriées dans +\fBapt\-get check\fR\&. Elle construit les caches des sources et des paquets à partir des sources répertoriées dans \fBsources.list\fR(5)et dans -\fI/var/lib/dpkg/status\fR. +\fI/var/lib/dpkg/status\fR\&. .RE .PP showpkg \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande showpkg -affiche des informations sur les paquets donnés en argument. Les arguments restants sont les noms de paquets. Les versions disponibles et les dépendances inverses de chaque paquet répertorié sont listées, ainsi que les dépendances normales pour chaque version. Les dépendances normales d'un paquet sont constituées par les paquets dont il dépend\ ; les dépendances inverses sont les paquets qui dépendent du paquet en question. Les dépendances normales doivent donc être satisfaites et les dépendances inverses n'ont pas besoin de l'être. Ainsi, la commande +affiche des informations sur les paquets donnés en argument\&. Les arguments restants sont les noms de paquets\&. Les versions disponibles et les dépendances inverses de chaque paquet répertorié sont listées, ainsi que les dépendances normales pour chaque version\&. Les dépendances normales d\'un paquet sont constituées par les paquets dont il dépend\ \&; les dépendances inverses sont les paquets qui dépendent du paquet en question\&. Les dépendances normales doivent donc être satisfaites et les dépendances inverses n\'ont pas besoin de l\'être\&. Ainsi, la commande \fBapt\-cache showpkg libreadline2\fR -donnera ce résultat\ : +donnera ce résultat\ \&: .sp -.RS 3n +.RS 4 .nf Package: libreadline2 -Versions: 2.1\-12(/var/state/apt/lists/foo_Packages), +Versions: 2\&.1\-12(/var/state/apt/lists/foo_Packages), Reverse Depends: libreadlineg2,libreadline2 libreadline2\-altdev,libreadline2 Dependencies: -2.1\-12 \- libc5 (2 5.4.0\-0) ncurses3.0 (0 (null)) +2\&.1\-12 \- libc5 (2 5\&.4\&.0\-0) ncurses3\&.0 (0 (null)) Provides: -2.1\-12 \- +2\&.1\-12 \- Reverse Provides: .fi .RE -On peut voir que libreadline2, version 2.1\-12, dépend de libc5, ncurses3.0\ ; ces paquets doivent être installés au préalable pour que libreadline2 fonctionne. À leur tour, libreadlineg2 et libreadline2\-altdev dépendent de libreadline2. Si libreadline2 est installé, libc5 et ncurses3.0 doivent être installés\ ; libreadlineg2 et libreadline2\-altdev n'ont pas à l'être. Pour connaître le sens de la fin de chaîne, il est préférable de consulter le code source d'APT. +On peut voir que libreadline2, version 2\&.1\-12, dépend de libc5, ncurses3\&.0\ \&; ces paquets doivent être installés au préalable pour que libreadline2 fonctionne\&. À leur tour, libreadlineg2 et libreadline2\-altdev dépendent de libreadline2\&. Si libreadline2 est installé, libc5 et ncurses3\&.0 doivent être installés\ \&; libreadlineg2 et libreadline2\-altdev n\'ont pas à l\'être\&. Pour connaître le sens de la fin de chaîne, il est préférable de consulter le code source d\'APT\&. .RE .PP stats -.RS 3n +.RS 4 La commande stats -affiche des statistiques à propos du cache. Aucun autre argument n'est attendu. Voici les informations rapportées\ : -.RS 3n -.TP 3n -\(bu - +affiche des statistiques à propos du cache\&. Aucun autre argument n\'est attendu\&. Voici les informations rapportées\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total package names -est le nombre de paquets trouvés dans le cache. -.TP 3n -\(bu - +est le nombre de paquets trouvés dans le cache\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Normal packages -est le nombre de paquets simples, ordinaires\ ; ces paquets tolèrent une correspondance bijective entre leur nom et le nom utilisé par les autres paquets pour les qualifier comme dépendance. La majorité des paquets appartient à cette catégorie. -.TP 3n -\(bu - +est le nombre de paquets simples, ordinaires\ \&; ces paquets tolèrent une correspondance bijective entre leur nom et le nom utilisé par les autres paquets pour les qualifier comme dépendance\&. La majorité des paquets appartient à cette catégorie\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Pure virtual packages -est le nombre des paquets qui n'existent que sous la forme d'un nom représentant un paquet virtuel\ ; ces paquets \(Fo\ fournissent\ \(Fc seulement un nom de paquet virtuel et aucun paquet n'utilise véritablement ce nom. Par exemple, au sein du système Debian GNU/Linux, le nom \(Fo\ mail\-transport\-agent\ \(Fc est un paquet virtuel pur\ ; plusieurs paquets peuvent \(Fo\ remplir\ \(Fc ce nom \(Fo\ mail\-transport\-agent\ \(Fc, mais il n'existe aucun paquet nommé \(Fo\ mail\-transport\-agent\ \(Fc. -.TP 3n -\(bu - +est le nombre des paquets qui n\'existent que sous la forme d\'un nom représentant un paquet virtuel\ \&; ces paquets \(Fo\ \&fournissent\ \&\(Fc seulement un nom de paquet virtuel et aucun paquet n\'utilise véritablement ce nom\&. Par exemple, au sein du système Debian GNU/Linux, le nom \(Fo\ \&mail\-transport\-agent\ \&\(Fc est un paquet virtuel pur\ \&; plusieurs paquets peuvent \(Fo\ \&remplir\ \&\(Fc ce nom \(Fo\ \&mail\-transport\-agent\ \&\(Fc, mais il n\'existe aucun paquet nommé \(Fo\ \&mail\-transport\-agent\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Single virtual packages -est le nombre de paquets virtuels qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ X11\-text\-viewer\ \(Fc est un paquet virtuel\ ; seul le paquet \(Fo\ xless\ \(Fc remplit \(Fo\ X11\-text\-viewer\ \(Fc. -.TP 3n -\(bu - +est le nombre de paquets virtuels qui ne peuvent être remplis que par un seul paquet\&. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ \&X11\-text\-viewer\ \&\(Fc est un paquet virtuel\ \&; seul le paquet \(Fo\ \&xless\ \&\(Fc remplit \(Fo\ \&X11\-text\-viewer\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Mixed virtual packages -est le nombre des paquets qui remplissent un paquet virtuel particulier ou dont le nom est un nom de paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ debconf\ \(Fc est un paquet réel et il est aussi fourni par \(Fo\ debconf\-tiny\ \(Fc. -.TP 3n -\(bu - +est le nombre des paquets qui remplissent un paquet virtuel particulier ou dont le nom est un nom de paquet virtuel\&. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ \&debconf\ \&\(Fc est un paquet réel et il est aussi fourni par \(Fo\ \&debconf\-tiny\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Missing -est le nombre de paquets référencés dans une dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants peuvent être mis en évidence quand on n'accède pas à une distribution complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. Habituellement on les trouve dans les champs \(Fo\ Conflicts\ \(Fc. -.TP 3n -\(bu - +est le nombre de paquets référencés dans une dépendance mais qui ne sont fournis par aucun paquet\&. Les paquets manquants peuvent être mis en évidence quand on n\'accède pas à une distribution complète ou si un paquet (réel ou virtuel) a été sorti d\'une distribution\&. Habituellement on les trouve dans les champs \(Fo\ \&Conflicts\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total distinct versions -est le nombre de versions de paquets trouvées dans le cache\ ; cette valeur est par conséquent au moins égale au nombre total de paquets. Quand on accède à plus d'une distribution (\(Fo\ stable\ \(Fc et \(Fo\ unstable\ \(Fc, par exemple), cette valeur peut être considérablement plus grande que le nombre total de paquets. -.TP 3n -\(bu - +est le nombre de versions de paquets trouvées dans le cache\ \&; cette valeur est par conséquent au moins égale au nombre total de paquets\&. Quand on accède à plus d\'une distribution (\(Fo\ \&stable\ \&\(Fc et \(Fo\ \&unstable\ \&\(Fc, par exemple), cette valeur peut être considérablement plus grande que le nombre total de paquets\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total dependencies -est le nombre de relations de dépendances déclarées par tous les paquets présents dans le cache. +est le nombre de relations de dépendances déclarées par tous les paquets présents dans le cache\&. .RE -.IP "" 3n +.IP "" 4 .RE .PP showsrc \fIpaquet(s)\fR -.RS 3n +.RS 4 showsrc -affiche toutes les entrées de paquet source qui correspondent aux noms donnés. Toutes les versions sont affichées et toutes les entrées qui déclarent que ces noms correspondent à des paquets binaires. +affiche toutes les entrées de paquet source qui correspondent aux noms donnés\&. Toutes les versions sont affichées et toutes les entrées qui déclarent que ces noms correspondent à des paquets binaires\&. .RE .PP dump -.RS 3n +.RS 4 La commande dump -affiche un court résumé sur chaque paquet du cache. Elle est d'abord destinée au débogage. +affiche un court résumé sur chaque paquet du cache\&. Elle est d\'abord destinée au débogage\&. .RE .PP dumpavail -.RS 3n +.RS 4 La commande dumpavail -affiche sur la sortie standard une liste des paquets disponibles. Elle convient à une utilisation avec +affiche sur la sortie standard une liste des paquets disponibles\&. Elle convient à une utilisation avec \fBdpkg\fR(8) et la méthode \fBdselect\fR(8) -s'en sert. +s\'en sert\&. .RE .PP unmet -.RS 3n +.RS 4 La commande unmet -affiche un résumé concernant toutes les dépendances absentes dans le cache de paquets. +affiche un résumé concernant toutes les dépendances absentes dans le cache de paquets\&. .RE .PP show \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande show est semblable à -\fBdpkg \-\-print\-avail\fR\ ; elle affiche des informations sur les paquets donnés en argument. +\fBdpkg \-\-print\-avail\fR\ \&; elle affiche des informations sur les paquets donnés en argument\&. .RE .PP -search \fIregex [ regex ... ]\fR -.RS 3n +search \fIregex [ regex \&.\&.\&. ]\fR +.RS 4 La commande search -recherche l'expression régulière donnée en argument sur tous les paquets disponibles. Elle cherche une occurrence de la chaîne dans les noms de paquets et dans les descriptions puis elle affiche le nom du paquet et sa description courte. Quand on donne l'option +recherche l\'expression régulière donnée en argument sur tous les paquets disponibles\&. Elle cherche une occurrence de la chaîne dans les noms de paquets et dans les descriptions puis elle affiche le nom du paquet et sa description courte\&. Quand on donne l\'option \fB\-\-full\fR, la sortie est identique à show -pour chaque paquet\ ; l'option +pour chaque paquet\ \&; l\'option \fB\-\-names\-only\fR -ne recherche pas la chaîne dans les descriptions longues mais seulement dans les noms de paquets. +ne recherche pas la chaîne dans les descriptions longues mais seulement dans les noms de paquets\&. .sp -On peut utiliser des arguments distincts pour indiquer des expressions régulières différentes sur lesquelles sera réalisé un \(Fo\ et\ \(Fc logique. +On peut utiliser des arguments distincts pour indiquer des expressions régulières différentes sur lesquelles sera réalisé un \(Fo\ \&et\ \&\(Fc logique\&. .RE .PP depends \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande depends -affiche la liste de toutes les dépendances d'un paquet et la liste de tous les paquets possibles qui satisfont ces dépendances. +affiche la liste de toutes les dépendances d\'un paquet et la liste de tous les paquets possibles qui satisfont ces dépendances\&. .RE .PP rdepends \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande rdepends -affiche la liste de toutes les dépendances inverses d'un paquet. +affiche la liste de toutes les dépendances inverses d\'un paquet\&. .RE .PP pkgnames \fI[ prefix ]\fR -.RS 3n -Cette commande affiche le nom de chaque paquet du système. Un préfixe pour filtrer la liste des noms peut être donné en argument. La sortie est appropriée à une utilisation au sein d'une fonction complète de shell\ ; elle est produite très rapidement. On utilise au mieux cette commande avec l'option -\fB\-\-generate\fR. +.RS 4 +Cette commande affiche le nom de chaque paquet du système\&. Un préfixe pour filtrer la liste des noms peut être donné en argument\&. La sortie est appropriée à une utilisation au sein d\'une fonction complète de shell\ \&; elle est produite très rapidement\&. On utilise au mieux cette commande avec l\'option +\fB\-\-generate\fR\&. .RE .PP dotty \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande dotty prend une liste de paquets sur la ligne de commande et affiche une sortie appropriée à une utilisation par la commande dotty du paquet -[1]\&\fIGraphViz\fR. Il en résulte un ensemble de noeuds et d'arcs représentant les relations entre les paquets. Par défaut les paquets donnés en argument suivent toutes leurs dépendances, ce qui peut produire un graphe très volumineux. Pour limiter la sortie aux seuls paquets listés sur la ligne de commande, positionnez l'option -APT::Cache::GivenOnly. +\fIGraphViz\fR\&[1]\&. Il en résulte un ensemble de noeuds et d\'arcs représentant les relations entre les paquets\&. Par défaut les paquets donnés en argument suivent toutes leurs dépendances, ce qui peut produire un graphe très volumineux\&. Pour limiter la sortie aux seuls paquets listés sur la ligne de commande, positionnez l\'option +APT::Cache::GivenOnly\&. .sp -Les noeuds résultants ont plusieurs formes\ ; les paquets normaux sont des boîtes, les \(Fo\ provides\ \(Fc purs sont des triangles, les \(Fo\ provides\ \(Fc mixtes sont des diamants et les paquets manquants sont des hexagones. Les boîtes oranges expriment un arrêt de la récursivité [paquet feuille], les lignes bleues représentent des prédépendances et les lignes vertes représentent des conflits. +Les noeuds résultants ont plusieurs formes\ \&; les paquets normaux sont des boîtes, les \(Fo\ \&provides\ \&\(Fc purs sont des triangles, les \(Fo\ \&provides\ \&\(Fc mixtes sont des diamants et les paquets manquants sont des hexagones\&. Les boîtes oranges expriment un arrêt de la récursivité [paquet feuille], les lignes bleues représentent des prédépendances et les lignes vertes représentent des conflits\&. .sp -Attention, dotty ne peut pas représenter des ensembles très grands de paquets. +Attention, dotty ne peut pas représenter des ensembles très grands de paquets\&. .RE .PP policy \fI[ paquet(s) ]\fR -.RS 3n +.RS 4 policy -sert à déboguer des problèmes relatifs au fichier des préférences. Sans argument, la commande affiche la priorité de chaque source. Sinon, elle affiche des informations précises sur la priorité du paquet donné en argument. +sert à déboguer des problèmes relatifs au fichier des préférences\&. Sans argument, la commande affiche la priorité de chaque source\&. Sinon, elle affiche des informations précises sur la priorité du paquet donné en argument\&. .RE .PP madison \fI[ paquet(s) ]\fR -.RS 3n +.RS 4 La commande madison -d'apt\-cache -cherche à mimer le format de sortie propre à l'outil debian de gestion d'archives, -madison, ainsi qu'une part de ses fonctionnalités. Elle affiche les versions disponibles d'un paquet dans un tableau. Contrairement au programme original -madison, elle n'affiche que des informations concernant l'architecture pour laquelle Apt a lu la liste des paquets disponibles (APT::Architecture). +d\'apt\-cache +cherche à mimer le format de sortie propre à l\'outil debian de gestion d\'archives, +madison, ainsi qu\'une part de ses fonctionnalités\&. Elle affiche les versions disponibles d\'un paquet dans un tableau\&. Contrairement au programme original +madison, elle n\'affiche que des informations concernant l\'architecture pour laquelle Apt a lu la liste des paquets disponibles (APT::Architecture)\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-p\fR, \fB\-\-pkg\-cache\fR -.RS 3n -Indique le fichier servant de cache des paquets. Le cache des paquets est le cache primaire utilisé par toutes les opérations. Élément de configuration\ : -Dir::Cache::pkgcache. +.RS 4 +Indique le fichier servant de cache des paquets\&. Le cache des paquets est le cache primaire utilisé par toutes les opérations\&. Élément de configuration\ \&: +Dir::Cache::pkgcache\&. .RE .PP \fB\-s\fR, \fB\-\-src\-cache\fR -.RS 3n -Indique le fichier servant de cache des sources. Ce cache n'est utilisé que par -gencaches\ ; une version des informations sur les paquets, faite à partir d'une analyse de sources distantes, est conservée. Quand le cache des paquets est créé, le cache des sources est utilisé afin d'éviter d'analyser à nouveau tous les paquets. Élément de configuration\ : -Dir::Cache::srcpkgcache. +.RS 4 +Indique le fichier servant de cache des sources\&. Ce cache n\'est utilisé que par +gencaches\ \&; une version des informations sur les paquets, faite à partir d\'une analyse de sources distantes, est conservée\&. Quand le cache des paquets est créé, le cache des sources est utilisé afin d\'éviter d\'analyser à nouveau tous les paquets\&. Élément de configuration\ \&: +Dir::Cache::srcpkgcache\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; produit une sortie pertinente pour l'enregistrement dans un fichier\-journal, sans afficher d'indicateur de progression. Un plus grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous pouvez aussi utiliser +.RS 4 +Mode silencieux\ \&; produit une sortie pertinente pour l\'enregistrement dans un fichier\-journal, sans afficher d\'indicateur de progression\&. Un plus grand nombre de q produira un plus grand silence, avec un maximum de 2\&. Vous pouvez aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, annulant le fichier de configuration. Élément de configuration\ : -quiet. +pour positionner le niveau de silence, annulant le fichier de configuration\&. Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-i\fR, \fB\-\-important\fR -.RS 3n -N'affiche que les dépendances importantes\ ; à utiliser avec la commande unmet pour n'afficher que les relations Depends et Pre\-Depends. Élément de configuration\ : -APT::Cache::Important. +.RS 4 +N\'affiche que les dépendances importantes\ \&; à utiliser avec la commande unmet pour n\'afficher que les relations Depends et Pre\-Depends\&. Élément de configuration\ \&: +APT::Cache::Important\&. .RE .PP \fB\-f\fR, \fB\-\-full\fR -.RS 3n -Affiche la totalité des champs d'information sur le paquet lors d'une recherche. Élément de configuration\ : -APT::Cache::ShowFull. +.RS 4 +Affiche la totalité des champs d\'information sur le paquet lors d\'une recherche\&. Élément de configuration\ \&: +APT::Cache::ShowFull\&. .RE .PP \fB\-a\fR, \fB\-\-all\-versions\fR -.RS 3n -Affiche la totalité des champs d'information pour toutes les versions disponibles\ : c'est la valeur par défaut. Pour la désactiver, utilisez l'option -\fB\-\-no\-all\-versions\fR. Quand l'option +.RS 4 +Affiche la totalité des champs d\'information pour toutes les versions disponibles\ \&: c\'est la valeur par défaut\&. Pour la désactiver, utilisez l\'option +\fB\-\-no\-all\-versions\fR\&. Quand l\'option \fB\-\-no\-all\-versions\fR -est choisie, seuls les éléments de la version choisie (celle qui serait installée) seront affichés. Cette option concerne seulement la commande -show. Élément de configuration\ : -APT::Cache::AllVersions. +est choisie, seuls les éléments de la version choisie (celle qui serait installée) seront affichés\&. Cette option concerne seulement la commande +show\&. Élément de configuration\ \&: +APT::Cache::AllVersions\&. .RE .PP \fB\-g\fR, \fB\-\-generate\fR -.RS 3n -Réalise une mise à jour automatique du cache des paquets plutôt que de se servir du cache actuel. Pour désactiver cette option (option par défaut), utilisez l'option -\fB\-\-no\-generate\fR. Élément de configuration\ : -APT::Cache::Generate. +.RS 4 +Réalise une mise à jour automatique du cache des paquets plutôt que de se servir du cache actuel\&. Pour désactiver cette option (option par défaut), utilisez l\'option +\fB\-\-no\-generate\fR\&. Élément de configuration\ \&: +APT::Cache::Generate\&. .RE .PP \fB\-\-names\-only\fR, \fB\-n\fR -.RS 3n -N'effectue une recherche que sur les noms de paquets et pas sur les descriptions longues. Élément de configuration\ : -APT::Cache::NamesOnly. +.RS 4 +N\'effectue une recherche que sur les noms de paquets et pas sur les descriptions longues\&. Élément de configuration\ \&: +APT::Cache::NamesOnly\&. .RE .PP \fB\-\-all\-names\fR -.RS 3n +.RS 4 Avec cette option pkgnames -affiche tous les noms, les noms des paquets virtuels et les dépendances manquantes. Élément de configuration\ : -APT::Cache::AllNames. +affiche tous les noms, les noms des paquets virtuels et les dépendances manquantes\&. Élément de configuration\ \&: +APT::Cache::AllNames\&. .RE .PP \fB\-\-recurse\fR -.RS 3n +.RS 4 Avec cette option depends et rdepends -sont récursives de manière à n'afficher qu'une seule fois les paquets mentionnés. Élément de configuration\ : -APT::Cache::RecurseDepends. +sont récursives de manière à n\'afficher qu\'une seule fois les paquets mentionnés\&. Élément de configuration\ \&: +APT::Cache::RecurseDepends\&. .RE .PP \fB\-\-installed\fR -.RS 3n +.RS 4 Cette option limite la sortie de depends et de rdepends -aux paquets qui sont actuellement installés. Élément de configuration\ : -APT::Cache::Installed. +aux paquets qui sont actuellement installés\&. Élément de configuration\ \&: +APT::Cache::Installed\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/sources.list\fR -.RS 3n -Emplacements où aller chercher les paquets. Élément de configuration\ : -Dir::Etc::SourceList. +\fI/etc/apt/sources\&.list\fR +.RS 4 +Emplacements où aller chercher les paquets\&. Élément de configuration\ \&: +Dir::Etc::SourceList\&. .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans -\fBsources.list\fR(5)Élément de configuration\ : -Dir::State::Lists. +\fBsources.list\fR(5)Élément de configuration\ \&: +Dir::State::Lists\&. .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n -Zone de stockage pour les informations en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les informations en transit\&. Élément de configuration\ \&: Dir::State::Lists -(partial est implicite). +(partial est implicite)\&. .RE .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), \fBsources.list\fR(5), -\fBapt\-get\fR(8). +\fBapt-get\fR(8)\&. .SH "DIAGNOSTICS" .PP \fBapt\-cache\fR -retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[2]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[2]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ GraphViz +.SH "NOTES" +.IP " 1." 4 +GraphViz +.RS 4 \%http://www.research.att.com/sw/tools/graphviz/ -.TP 3 -2.\ page concernant les bogues d'APT +.RE +.IP " 2." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-cache.fr.8 b/doc/fr/apt-cache.fr.8 index deac129..44e9ddc 100644 --- a/doc/fr/apt-cache.fr.8 +++ b/doc/fr/apt-cache.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cache +.\" Title: apt-cache .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-cache \- Gestion des paquets et manipulation du cache par APT +apt-cache \- Gestion des paquets et manipulation du cache par APT .SH "SYNOPSIS" .HP 10 \fBapt\-cache\fR [\fB\-hvsn\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[add\ \fIfichier\fR...] | [gencaches] | [showpkg\ \fIpaquet\fR...] | [showsrc\ \fIpaquet\fR...] | [stats] | [dump] | [dumpavail] | [unmet] | [search\ \fIregex\fR] | [show\ \fIpaquet\fR...] | [depends\ \fIpaquet\fR...] | [rdepends\ \fIpaquet\fR...] | [pkgnames\ \fIprefix\fR] | [dotty\ \fIpaquet\fR...] | [policy\ \fIpaquets\fR...] | [madison\ \fIpaquets\fR...]} @@ -19,382 +19,392 @@ apt\-cache \- Gestion des paquets et manipulation du cache par APT .PP \fBapt\-cache\fR -réalise différentes opérations sur le cache de paquet d' APT. +réalise différentes opérations sur le cache de paquet d\' APT\&. \fBapt\-cache\fR -ne manipule pas l'état du système mais fournit des moyens de recherche dans les métadonnées d'un paquet desquelles il extrait d'intéressantes informations. +ne manipule pas l\'état du système mais fournit des moyens de recherche dans les métadonnées d\'un paquet desquelles il extrait d\'intéressantes informations\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP add \fIfichier(s)\fR -.RS 3n +.RS 4 La commande add -ajoute des fichiers indexant des paquets au cache des paquets. Cela sert uniquement pour le débogage. +ajoute des fichiers indexant des paquets au cache des paquets\&. Cela sert uniquement pour le débogage\&. .RE .PP gencaches -.RS 3n +.RS 4 La commande gencaches fait la même chose que -\fBapt\-get check\fR. Elle construit les caches des sources et des paquets à partir des sources répertoriées dans +\fBapt\-get check\fR\&. Elle construit les caches des sources et des paquets à partir des sources répertoriées dans \fBsources.list\fR(5)et dans -\fI/var/lib/dpkg/status\fR. +\fI/var/lib/dpkg/status\fR\&. .RE .PP showpkg \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande showpkg -affiche des informations sur les paquets donnés en argument. Les arguments restants sont les noms de paquets. Les versions disponibles et les dépendances inverses de chaque paquet répertorié sont listées, ainsi que les dépendances normales pour chaque version. Les dépendances normales d'un paquet sont constituées par les paquets dont il dépend\ ; les dépendances inverses sont les paquets qui dépendent du paquet en question. Les dépendances normales doivent donc être satisfaites et les dépendances inverses n'ont pas besoin de l'être. Ainsi, la commande +affiche des informations sur les paquets donnés en argument\&. Les arguments restants sont les noms de paquets\&. Les versions disponibles et les dépendances inverses de chaque paquet répertorié sont listées, ainsi que les dépendances normales pour chaque version\&. Les dépendances normales d\'un paquet sont constituées par les paquets dont il dépend\ \&; les dépendances inverses sont les paquets qui dépendent du paquet en question\&. Les dépendances normales doivent donc être satisfaites et les dépendances inverses n\'ont pas besoin de l\'être\&. Ainsi, la commande \fBapt\-cache showpkg libreadline2\fR -donnera ce résultat\ : +donnera ce résultat\ \&: .sp -.RS 3n +.RS 4 .nf Package: libreadline2 -Versions: 2.1\-12(/var/state/apt/lists/foo_Packages), +Versions: 2\&.1\-12(/var/state/apt/lists/foo_Packages), Reverse Depends: libreadlineg2,libreadline2 libreadline2\-altdev,libreadline2 Dependencies: -2.1\-12 \- libc5 (2 5.4.0\-0) ncurses3.0 (0 (null)) +2\&.1\-12 \- libc5 (2 5\&.4\&.0\-0) ncurses3\&.0 (0 (null)) Provides: -2.1\-12 \- +2\&.1\-12 \- Reverse Provides: .fi .RE -On peut voir que libreadline2, version 2.1\-12, dépend de libc5, ncurses3.0\ ; ces paquets doivent être installés au préalable pour que libreadline2 fonctionne. À leur tour, libreadlineg2 et libreadline2\-altdev dépendent de libreadline2. Si libreadline2 est installé, libc5 et ncurses3.0 doivent être installés\ ; libreadlineg2 et libreadline2\-altdev n'ont pas à l'être. Pour connaître le sens de la fin de chaîne, il est préférable de consulter le code source d'APT. +On peut voir que libreadline2, version 2\&.1\-12, dépend de libc5, ncurses3\&.0\ \&; ces paquets doivent être installés au préalable pour que libreadline2 fonctionne\&. À leur tour, libreadlineg2 et libreadline2\-altdev dépendent de libreadline2\&. Si libreadline2 est installé, libc5 et ncurses3\&.0 doivent être installés\ \&; libreadlineg2 et libreadline2\-altdev n\'ont pas à l\'être\&. Pour connaître le sens de la fin de chaîne, il est préférable de consulter le code source d\'APT\&. .RE .PP stats -.RS 3n +.RS 4 La commande stats -affiche des statistiques à propos du cache. Aucun autre argument n'est attendu. Voici les informations rapportées\ : -.RS 3n -.TP 3n -\(bu - +affiche des statistiques à propos du cache\&. Aucun autre argument n\'est attendu\&. Voici les informations rapportées\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total package names -est le nombre de paquets trouvés dans le cache. -.TP 3n -\(bu - +est le nombre de paquets trouvés dans le cache\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Normal packages -est le nombre de paquets simples, ordinaires\ ; ces paquets tolèrent une correspondance bijective entre leur nom et le nom utilisé par les autres paquets pour les qualifier comme dépendance. La majorité des paquets appartient à cette catégorie. -.TP 3n -\(bu - +est le nombre de paquets simples, ordinaires\ \&; ces paquets tolèrent une correspondance bijective entre leur nom et le nom utilisé par les autres paquets pour les qualifier comme dépendance\&. La majorité des paquets appartient à cette catégorie\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Pure virtual packages -est le nombre des paquets qui n'existent que sous la forme d'un nom représentant un paquet virtuel\ ; ces paquets \(Fo\ fournissent\ \(Fc seulement un nom de paquet virtuel et aucun paquet n'utilise véritablement ce nom. Par exemple, au sein du système Debian GNU/Linux, le nom \(Fo\ mail\-transport\-agent\ \(Fc est un paquet virtuel pur\ ; plusieurs paquets peuvent \(Fo\ remplir\ \(Fc ce nom \(Fo\ mail\-transport\-agent\ \(Fc, mais il n'existe aucun paquet nommé \(Fo\ mail\-transport\-agent\ \(Fc. -.TP 3n -\(bu - +est le nombre des paquets qui n\'existent que sous la forme d\'un nom représentant un paquet virtuel\ \&; ces paquets \(Fo\ \&fournissent\ \&\(Fc seulement un nom de paquet virtuel et aucun paquet n\'utilise véritablement ce nom\&. Par exemple, au sein du système Debian GNU/Linux, le nom \(Fo\ \&mail\-transport\-agent\ \&\(Fc est un paquet virtuel pur\ \&; plusieurs paquets peuvent \(Fo\ \&remplir\ \&\(Fc ce nom \(Fo\ \&mail\-transport\-agent\ \&\(Fc, mais il n\'existe aucun paquet nommé \(Fo\ \&mail\-transport\-agent\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Single virtual packages -est le nombre de paquets virtuels qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ X11\-text\-viewer\ \(Fc est un paquet virtuel\ ; seul le paquet \(Fo\ xless\ \(Fc remplit \(Fo\ X11\-text\-viewer\ \(Fc. -.TP 3n -\(bu - +est le nombre de paquets virtuels qui ne peuvent être remplis que par un seul paquet\&. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ \&X11\-text\-viewer\ \&\(Fc est un paquet virtuel\ \&; seul le paquet \(Fo\ \&xless\ \&\(Fc remplit \(Fo\ \&X11\-text\-viewer\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Mixed virtual packages -est le nombre des paquets qui remplissent un paquet virtuel particulier ou dont le nom est un nom de paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ debconf\ \(Fc est un paquet réel et il est aussi fourni par \(Fo\ debconf\-tiny\ \(Fc. -.TP 3n -\(bu - +est le nombre des paquets qui remplissent un paquet virtuel particulier ou dont le nom est un nom de paquet virtuel\&. Par exemple, au sein du système Debian GNU/Linux, \(Fo\ \&debconf\ \&\(Fc est un paquet réel et il est aussi fourni par \(Fo\ \&debconf\-tiny\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Missing -est le nombre de paquets référencés dans une dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants peuvent être mis en évidence quand on n'accède pas à une distribution complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. Habituellement on les trouve dans les champs \(Fo\ Conflicts\ \(Fc. -.TP 3n -\(bu - +est le nombre de paquets référencés dans une dépendance mais qui ne sont fournis par aucun paquet\&. Les paquets manquants peuvent être mis en évidence quand on n\'accède pas à une distribution complète ou si un paquet (réel ou virtuel) a été sorti d\'une distribution\&. Habituellement on les trouve dans les champs \(Fo\ \&Conflicts\ \&\(Fc\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total distinct versions -est le nombre de versions de paquets trouvées dans le cache\ ; cette valeur est par conséquent au moins égale au nombre total de paquets. Quand on accède à plus d'une distribution (\(Fo\ stable\ \(Fc et \(Fo\ unstable\ \(Fc, par exemple), cette valeur peut être considérablement plus grande que le nombre total de paquets. -.TP 3n -\(bu - +est le nombre de versions de paquets trouvées dans le cache\ \&; cette valeur est par conséquent au moins égale au nombre total de paquets\&. Quand on accède à plus d\'une distribution (\(Fo\ \&stable\ \&\(Fc et \(Fo\ \&unstable\ \&\(Fc, par exemple), cette valeur peut être considérablement plus grande que le nombre total de paquets\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03' Total dependencies -est le nombre de relations de dépendances déclarées par tous les paquets présents dans le cache. +est le nombre de relations de dépendances déclarées par tous les paquets présents dans le cache\&. .RE -.IP "" 3n +.IP "" 4 .RE .PP showsrc \fIpaquet(s)\fR -.RS 3n +.RS 4 showsrc -affiche toutes les entrées de paquet source qui correspondent aux noms donnés. Toutes les versions sont affichées et toutes les entrées qui déclarent que ces noms correspondent à des paquets binaires. +affiche toutes les entrées de paquet source qui correspondent aux noms donnés\&. Toutes les versions sont affichées et toutes les entrées qui déclarent que ces noms correspondent à des paquets binaires\&. .RE .PP dump -.RS 3n +.RS 4 La commande dump -affiche un court résumé sur chaque paquet du cache. Elle est d'abord destinée au débogage. +affiche un court résumé sur chaque paquet du cache\&. Elle est d\'abord destinée au débogage\&. .RE .PP dumpavail -.RS 3n +.RS 4 La commande dumpavail -affiche sur la sortie standard une liste des paquets disponibles. Elle convient à une utilisation avec +affiche sur la sortie standard une liste des paquets disponibles\&. Elle convient à une utilisation avec \fBdpkg\fR(8) et la méthode \fBdselect\fR(8) -s'en sert. +s\'en sert\&. .RE .PP unmet -.RS 3n +.RS 4 La commande unmet -affiche un résumé concernant toutes les dépendances absentes dans le cache de paquets. +affiche un résumé concernant toutes les dépendances absentes dans le cache de paquets\&. .RE .PP show \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande show est semblable à -\fBdpkg \-\-print\-avail\fR\ ; elle affiche des informations sur les paquets donnés en argument. +\fBdpkg \-\-print\-avail\fR\ \&; elle affiche des informations sur les paquets donnés en argument\&. .RE .PP -search \fIregex [ regex ... ]\fR -.RS 3n +search \fIregex [ regex \&.\&.\&. ]\fR +.RS 4 La commande search -recherche l'expression régulière donnée en argument sur tous les paquets disponibles. Elle cherche une occurrence de la chaîne dans les noms de paquets et dans les descriptions puis elle affiche le nom du paquet et sa description courte. Quand on donne l'option +recherche l\'expression régulière donnée en argument sur tous les paquets disponibles\&. Elle cherche une occurrence de la chaîne dans les noms de paquets et dans les descriptions puis elle affiche le nom du paquet et sa description courte\&. Quand on donne l\'option \fB\-\-full\fR, la sortie est identique à show -pour chaque paquet\ ; l'option +pour chaque paquet\ \&; l\'option \fB\-\-names\-only\fR -ne recherche pas la chaîne dans les descriptions longues mais seulement dans les noms de paquets. +ne recherche pas la chaîne dans les descriptions longues mais seulement dans les noms de paquets\&. .sp -On peut utiliser des arguments distincts pour indiquer des expressions régulières différentes sur lesquelles sera réalisé un \(Fo\ et\ \(Fc logique. +On peut utiliser des arguments distincts pour indiquer des expressions régulières différentes sur lesquelles sera réalisé un \(Fo\ \&et\ \&\(Fc logique\&. .RE .PP depends \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande depends -affiche la liste de toutes les dépendances d'un paquet et la liste de tous les paquets possibles qui satisfont ces dépendances. +affiche la liste de toutes les dépendances d\'un paquet et la liste de tous les paquets possibles qui satisfont ces dépendances\&. .RE .PP rdepends \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande rdepends -affiche la liste de toutes les dépendances inverses d'un paquet. +affiche la liste de toutes les dépendances inverses d\'un paquet\&. .RE .PP pkgnames \fI[ prefix ]\fR -.RS 3n -Cette commande affiche le nom de chaque paquet du système. Un préfixe pour filtrer la liste des noms peut être donné en argument. La sortie est appropriée à une utilisation au sein d'une fonction complète de shell\ ; elle est produite très rapidement. On utilise au mieux cette commande avec l'option -\fB\-\-generate\fR. +.RS 4 +Cette commande affiche le nom de chaque paquet du système\&. Un préfixe pour filtrer la liste des noms peut être donné en argument\&. La sortie est appropriée à une utilisation au sein d\'une fonction complète de shell\ \&; elle est produite très rapidement\&. On utilise au mieux cette commande avec l\'option +\fB\-\-generate\fR\&. .RE .PP dotty \fIpaquet(s)\fR -.RS 3n +.RS 4 La commande dotty prend une liste de paquets sur la ligne de commande et affiche une sortie appropriée à une utilisation par la commande dotty du paquet -[1]\&\fIGraphViz\fR. Il en résulte un ensemble de noeuds et d'arcs représentant les relations entre les paquets. Par défaut les paquets donnés en argument suivent toutes leurs dépendances, ce qui peut produire un graphe très volumineux. Pour limiter la sortie aux seuls paquets listés sur la ligne de commande, positionnez l'option -APT::Cache::GivenOnly. +\fIGraphViz\fR\&[1]\&. Il en résulte un ensemble de noeuds et d\'arcs représentant les relations entre les paquets\&. Par défaut les paquets donnés en argument suivent toutes leurs dépendances, ce qui peut produire un graphe très volumineux\&. Pour limiter la sortie aux seuls paquets listés sur la ligne de commande, positionnez l\'option +APT::Cache::GivenOnly\&. .sp -Les noeuds résultants ont plusieurs formes\ ; les paquets normaux sont des boîtes, les \(Fo\ provides\ \(Fc purs sont des triangles, les \(Fo\ provides\ \(Fc mixtes sont des diamants et les paquets manquants sont des hexagones. Les boîtes oranges expriment un arrêt de la récursivité [paquet feuille], les lignes bleues représentent des prédépendances et les lignes vertes représentent des conflits. +Les noeuds résultants ont plusieurs formes\ \&; les paquets normaux sont des boîtes, les \(Fo\ \&provides\ \&\(Fc purs sont des triangles, les \(Fo\ \&provides\ \&\(Fc mixtes sont des diamants et les paquets manquants sont des hexagones\&. Les boîtes oranges expriment un arrêt de la récursivité [paquet feuille], les lignes bleues représentent des prédépendances et les lignes vertes représentent des conflits\&. .sp -Attention, dotty ne peut pas représenter des ensembles très grands de paquets. +Attention, dotty ne peut pas représenter des ensembles très grands de paquets\&. .RE .PP policy \fI[ paquet(s) ]\fR -.RS 3n +.RS 4 policy -sert à déboguer des problèmes relatifs au fichier des préférences. Sans argument, la commande affiche la priorité de chaque source. Sinon, elle affiche des informations précises sur la priorité du paquet donné en argument. +sert à déboguer des problèmes relatifs au fichier des préférences\&. Sans argument, la commande affiche la priorité de chaque source\&. Sinon, elle affiche des informations précises sur la priorité du paquet donné en argument\&. .RE .PP madison \fI[ paquet(s) ]\fR -.RS 3n +.RS 4 La commande madison -d'apt\-cache -cherche à mimer le format de sortie propre à l'outil debian de gestion d'archives, -madison, ainsi qu'une part de ses fonctionnalités. Elle affiche les versions disponibles d'un paquet dans un tableau. Contrairement au programme original -madison, elle n'affiche que des informations concernant l'architecture pour laquelle Apt a lu la liste des paquets disponibles (APT::Architecture). +d\'apt\-cache +cherche à mimer le format de sortie propre à l\'outil debian de gestion d\'archives, +madison, ainsi qu\'une part de ses fonctionnalités\&. Elle affiche les versions disponibles d\'un paquet dans un tableau\&. Contrairement au programme original +madison, elle n\'affiche que des informations concernant l\'architecture pour laquelle Apt a lu la liste des paquets disponibles (APT::Architecture)\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-p\fR, \fB\-\-pkg\-cache\fR -.RS 3n -Indique le fichier servant de cache des paquets. Le cache des paquets est le cache primaire utilisé par toutes les opérations. Élément de configuration\ : -Dir::Cache::pkgcache. +.RS 4 +Indique le fichier servant de cache des paquets\&. Le cache des paquets est le cache primaire utilisé par toutes les opérations\&. Élément de configuration\ \&: +Dir::Cache::pkgcache\&. .RE .PP \fB\-s\fR, \fB\-\-src\-cache\fR -.RS 3n -Indique le fichier servant de cache des sources. Ce cache n'est utilisé que par -gencaches\ ; une version des informations sur les paquets, faite à partir d'une analyse de sources distantes, est conservée. Quand le cache des paquets est créé, le cache des sources est utilisé afin d'éviter d'analyser à nouveau tous les paquets. Élément de configuration\ : -Dir::Cache::srcpkgcache. +.RS 4 +Indique le fichier servant de cache des sources\&. Ce cache n\'est utilisé que par +gencaches\ \&; une version des informations sur les paquets, faite à partir d\'une analyse de sources distantes, est conservée\&. Quand le cache des paquets est créé, le cache des sources est utilisé afin d\'éviter d\'analyser à nouveau tous les paquets\&. Élément de configuration\ \&: +Dir::Cache::srcpkgcache\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; produit une sortie pertinente pour l'enregistrement dans un fichier\-journal, sans afficher d'indicateur de progression. Un plus grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous pouvez aussi utiliser +.RS 4 +Mode silencieux\ \&; produit une sortie pertinente pour l\'enregistrement dans un fichier\-journal, sans afficher d\'indicateur de progression\&. Un plus grand nombre de q produira un plus grand silence, avec un maximum de 2\&. Vous pouvez aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, annulant le fichier de configuration. Élément de configuration\ : -quiet. +pour positionner le niveau de silence, annulant le fichier de configuration\&. Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-i\fR, \fB\-\-important\fR -.RS 3n -N'affiche que les dépendances importantes\ ; à utiliser avec la commande unmet pour n'afficher que les relations Depends et Pre\-Depends. Élément de configuration\ : -APT::Cache::Important. +.RS 4 +N\'affiche que les dépendances importantes\ \&; à utiliser avec la commande unmet pour n\'afficher que les relations Depends et Pre\-Depends\&. Élément de configuration\ \&: +APT::Cache::Important\&. .RE .PP \fB\-f\fR, \fB\-\-full\fR -.RS 3n -Affiche la totalité des champs d'information sur le paquet lors d'une recherche. Élément de configuration\ : -APT::Cache::ShowFull. +.RS 4 +Affiche la totalité des champs d\'information sur le paquet lors d\'une recherche\&. Élément de configuration\ \&: +APT::Cache::ShowFull\&. .RE .PP \fB\-a\fR, \fB\-\-all\-versions\fR -.RS 3n -Affiche la totalité des champs d'information pour toutes les versions disponibles\ : c'est la valeur par défaut. Pour la désactiver, utilisez l'option -\fB\-\-no\-all\-versions\fR. Quand l'option +.RS 4 +Affiche la totalité des champs d\'information pour toutes les versions disponibles\ \&: c\'est la valeur par défaut\&. Pour la désactiver, utilisez l\'option +\fB\-\-no\-all\-versions\fR\&. Quand l\'option \fB\-\-no\-all\-versions\fR -est choisie, seuls les éléments de la version choisie (celle qui serait installée) seront affichés. Cette option concerne seulement la commande -show. Élément de configuration\ : -APT::Cache::AllVersions. +est choisie, seuls les éléments de la version choisie (celle qui serait installée) seront affichés\&. Cette option concerne seulement la commande +show\&. Élément de configuration\ \&: +APT::Cache::AllVersions\&. .RE .PP \fB\-g\fR, \fB\-\-generate\fR -.RS 3n -Réalise une mise à jour automatique du cache des paquets plutôt que de se servir du cache actuel. Pour désactiver cette option (option par défaut), utilisez l'option -\fB\-\-no\-generate\fR. Élément de configuration\ : -APT::Cache::Generate. +.RS 4 +Réalise une mise à jour automatique du cache des paquets plutôt que de se servir du cache actuel\&. Pour désactiver cette option (option par défaut), utilisez l\'option +\fB\-\-no\-generate\fR\&. Élément de configuration\ \&: +APT::Cache::Generate\&. .RE .PP \fB\-\-names\-only\fR, \fB\-n\fR -.RS 3n -N'effectue une recherche que sur les noms de paquets et pas sur les descriptions longues. Élément de configuration\ : -APT::Cache::NamesOnly. +.RS 4 +N\'effectue une recherche que sur les noms de paquets et pas sur les descriptions longues\&. Élément de configuration\ \&: +APT::Cache::NamesOnly\&. .RE .PP \fB\-\-all\-names\fR -.RS 3n +.RS 4 Avec cette option pkgnames -affiche tous les noms, les noms des paquets virtuels et les dépendances manquantes. Élément de configuration\ : -APT::Cache::AllNames. +affiche tous les noms, les noms des paquets virtuels et les dépendances manquantes\&. Élément de configuration\ \&: +APT::Cache::AllNames\&. .RE .PP \fB\-\-recurse\fR -.RS 3n +.RS 4 Avec cette option depends et rdepends -sont récursives de manière à n'afficher qu'une seule fois les paquets mentionnés. Élément de configuration\ : -APT::Cache::RecurseDepends. +sont récursives de manière à n\'afficher qu\'une seule fois les paquets mentionnés\&. Élément de configuration\ \&: +APT::Cache::RecurseDepends\&. .RE .PP \fB\-\-installed\fR -.RS 3n +.RS 4 Cette option limite la sortie de depends et de rdepends -aux paquets qui sont actuellement installés. Élément de configuration\ : -APT::Cache::Installed. +aux paquets qui sont actuellement installés\&. Élément de configuration\ \&: +APT::Cache::Installed\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/sources.list\fR -.RS 3n -Emplacements où aller chercher les paquets. Élément de configuration\ : -Dir::Etc::SourceList. +\fI/etc/apt/sources\&.list\fR +.RS 4 +Emplacements où aller chercher les paquets\&. Élément de configuration\ \&: +Dir::Etc::SourceList\&. .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans -\fBsources.list\fR(5)Élément de configuration\ : -Dir::State::Lists. +\fBsources.list\fR(5)Élément de configuration\ \&: +Dir::State::Lists\&. .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n -Zone de stockage pour les informations en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les informations en transit\&. Élément de configuration\ \&: Dir::State::Lists -(partial est implicite). +(partial est implicite)\&. .RE .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), \fBsources.list\fR(5), -\fBapt\-get\fR(8). +\fBapt-get\fR(8)\&. .SH "DIAGNOSTICS" .PP \fBapt\-cache\fR -retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[2]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[2]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ GraphViz +.SH "NOTES" +.IP " 1." 4 +GraphViz +.RS 4 \%http://www.research.att.com/sw/tools/graphviz/ -.TP 3 -2.\ page concernant les bogues d'APT +.RE +.IP " 2." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-cdrom.8 b/doc/fr/apt-cdrom.8 index 0d797ba..e82eaa9 100644 --- a/doc/fr/apt-cdrom.8 +++ b/doc/fr/apt-cdrom.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cdrom +.\" Title: apt-cdrom .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-cdrom \- Gestion des cédéroms par APT +apt-cdrom \- Gestion des cédéroms par APT .SH "SYNOPSIS" .HP 10 \fBapt\-cdrom\fR [\fB\-hvrmfan\fR] [\fB\-d=\fR\fB\fIpoint\ de\ montage\ du\ cédérom\fR\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] [[add] | [ident]] @@ -19,142 +19,144 @@ apt\-cdrom \- Gestion des c .PP \fBapt\-cdrom\fR -est utilisé pour ajouter un nouveau cédérom à la liste des sources disponibles. +est utilisé pour ajouter un nouveau cédérom à la liste des sources disponibles\&. \fBapt\-cdrom\fR -prend soin de déterminer la structure du disque, de corriger de possibles erreurs de gravure et de vérifier les fichiers d'index. +prend soin de déterminer la structure du disque, de corriger de possibles erreurs de gravure et de vérifier les fichiers d\'index\&. .PP -Il est nécessaire d'utiliser +Il est nécessaire d\'utiliser \fBapt\-cdrom\fR -pour ajouter des cédéroms au système APT, cela ne peut être réalisé \(Fo\ à la main\ \(Fc. Par ailleurs, chaque disque d'un ensemble de cédéroms doit être séparément inséré et parcouru pour prendre en compte de possibles erreurs de gravure. +pour ajouter des cédéroms au système APT, cela ne peut être réalisé \(Fo\ \&à la main\ \&\(Fc\&. Par ailleurs, chaque disque d\'un ensemble de cédéroms doit être séparément inséré et parcouru pour prendre en compte de possibles erreurs de gravure\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP add -.RS 3n +.RS 4 La commande add -est utilisée pour ajouter un nouveau disque à la liste des sources. Elle démonte le cédérom, réclame l'insertion d'un disque, parcourt ensuite le disque et copie les fichiers d'index. Si le disque ne possède pas de répertoire +est utilisée pour ajouter un nouveau disque à la liste des sources\&. Elle démonte le cédérom, réclame l\'insertion d\'un disque, parcourt ensuite le disque et copie les fichiers d\'index\&. Si le disque ne possède pas de répertoire \fIdisk/\fR -correct, un titre descriptif est demandé. +correct, un titre descriptif est demandé\&. .sp APT utilise un identifiant de cédérom pour reconnaître le disque qui se trouve actuellement dans le lecteur et maintient une base de données de ces identifiants dans -\fI/var/lib/apt/cdroms.list\fR. +\fI/var/lib/apt/cdroms\&.list\fR\&. .RE .PP ident -.RS 3n -Un outil de débogage pour rapporter l'identifiant du disque actuel ainsi que le nom du fichier stocké. +.RS 4 +Un outil de débogage pour rapporter l\'identifiant du disque actuel ainsi que le nom du fichier stocké\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-d\fR, \fB\-\-cdrom\fR -.RS 3n -Point de montage\ ; spécifie l'emplacement de montage du cédérom. Ce point de montage doit être spécifié dans +.RS 4 +Point de montage\ \&; spécifie l\'emplacement de montage du cédérom\&. Ce point de montage doit être spécifié dans \fI/etc/fstab\fR -et correctement configuré. Élément de configuration\ : -Acquire::cdrom::mount. +et correctement configuré\&. Élément de configuration\ \&: +Acquire::cdrom::mount\&. .RE .PP \fB\-r\fR, \fB\-\-rename\fR -.RS 3n -Change le nom d'un disque\ ; change le nom d'un disque ou annule le nom donné aux disques. Cette option oblige +.RS 4 +Change le nom d\'un disque\ \&; change le nom d\'un disque ou annule le nom donné aux disques\&. Cette option oblige \fBapt\-cdrom\fR -à demander un nouveau nom à l'utilisateur. Élément de configuration\ : -APT::CDROM::Rename. +à demander un nouveau nom à l\'utilisateur\&. Élément de configuration\ \&: +APT::CDROM::Rename\&. .RE .PP \fB\-m\fR, \fB\-\-no\-mount\fR -.RS 3n -Pas de montage\ ; empêche +.RS 4 +Pas de montage\ \&; empêche \fBapt\-cdrom\fR -de monter ou démonter le point de montage. Élément de configuration\ : -APT::CDROM::NoMount. +de monter ou démonter le point de montage\&. Élément de configuration\ \&: +APT::CDROM::NoMount\&. .RE .PP \fB\-f\fR, \fB\-\-fast\fR -.RS 3n -Copie rapide\ ; suppose que les paquets sont valides et ne vérifie pas chaque paquet. Cette option ne devrait être utilisée que si +.RS 4 +Copie rapide\ \&; suppose que les paquets sont valides et ne vérifie pas chaque paquet\&. Cette option ne devrait être utilisée que si \fBapt\-cdrom\fR -a préalablement utilisé ce disque et n'a trouvé aucune erreur. Élément de configuration\ : -APT::CDROM::Fast. +a préalablement utilisé ce disque et n\'a trouvé aucune erreur\&. Élément de configuration\ \&: +APT::CDROM::Fast\&. .RE .PP \fB\-a\fR, \fB\-\-thorough\fR -.RS 3n -Parcours minutieux des paquets\ ; cette option peut être nécessaire avec de vieux cédéroms de systèmes Debian 1.1 ou 1.2 dont les fichiers Packages sont situés dans des endroits étranges. Il faudra plus de temps pour parcourir le CD mais tous les paquets seront repérés. +.RS 4 +Parcours minutieux des paquets\ \&; cette option peut être nécessaire avec de vieux cédéroms de systèmes Debian 1\&.1 ou 1\&.2 dont les fichiers Packages sont situés dans des endroits étranges\&. Il faudra plus de temps pour parcourir le CD mais tous les paquets seront repérés\&. .RE .PP \fB\-n\fR, \fB\-\-just\-print\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -Aucune modification\ ; ne pas modifier le fichier -\fBsources.list\fR(5)ni les fichiers d'index. Cependant, tout est vérifié. Élément de configuration\ : -APT::CDROM::NoAct. +.RS 4 +Aucune modification\ \&; ne pas modifier le fichier +\fBsources.list\fR(5)ni les fichiers d\'index\&. Cependant, tout est vérifié\&. Élément de configuration\ \&: +APT::CDROM::NoAct\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), -\fBsources.list\fR(5). +\fBapt-get\fR(8), +\fBsources.list\fR(5)\&. .SH "DIAGNOSTICS" .PP \fBapt\-cdrom\fR -retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-cdrom.fr.8 b/doc/fr/apt-cdrom.fr.8 index 0d797ba..e82eaa9 100644 --- a/doc/fr/apt-cdrom.fr.8 +++ b/doc/fr/apt-cdrom.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cdrom +.\" Title: apt-cdrom .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-cdrom \- Gestion des cédéroms par APT +apt-cdrom \- Gestion des cédéroms par APT .SH "SYNOPSIS" .HP 10 \fBapt\-cdrom\fR [\fB\-hvrmfan\fR] [\fB\-d=\fR\fB\fIpoint\ de\ montage\ du\ cédérom\fR\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] [[add] | [ident]] @@ -19,142 +19,144 @@ apt\-cdrom \- Gestion des c .PP \fBapt\-cdrom\fR -est utilisé pour ajouter un nouveau cédérom à la liste des sources disponibles. +est utilisé pour ajouter un nouveau cédérom à la liste des sources disponibles\&. \fBapt\-cdrom\fR -prend soin de déterminer la structure du disque, de corriger de possibles erreurs de gravure et de vérifier les fichiers d'index. +prend soin de déterminer la structure du disque, de corriger de possibles erreurs de gravure et de vérifier les fichiers d\'index\&. .PP -Il est nécessaire d'utiliser +Il est nécessaire d\'utiliser \fBapt\-cdrom\fR -pour ajouter des cédéroms au système APT, cela ne peut être réalisé \(Fo\ à la main\ \(Fc. Par ailleurs, chaque disque d'un ensemble de cédéroms doit être séparément inséré et parcouru pour prendre en compte de possibles erreurs de gravure. +pour ajouter des cédéroms au système APT, cela ne peut être réalisé \(Fo\ \&à la main\ \&\(Fc\&. Par ailleurs, chaque disque d\'un ensemble de cédéroms doit être séparément inséré et parcouru pour prendre en compte de possibles erreurs de gravure\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP add -.RS 3n +.RS 4 La commande add -est utilisée pour ajouter un nouveau disque à la liste des sources. Elle démonte le cédérom, réclame l'insertion d'un disque, parcourt ensuite le disque et copie les fichiers d'index. Si le disque ne possède pas de répertoire +est utilisée pour ajouter un nouveau disque à la liste des sources\&. Elle démonte le cédérom, réclame l\'insertion d\'un disque, parcourt ensuite le disque et copie les fichiers d\'index\&. Si le disque ne possède pas de répertoire \fIdisk/\fR -correct, un titre descriptif est demandé. +correct, un titre descriptif est demandé\&. .sp APT utilise un identifiant de cédérom pour reconnaître le disque qui se trouve actuellement dans le lecteur et maintient une base de données de ces identifiants dans -\fI/var/lib/apt/cdroms.list\fR. +\fI/var/lib/apt/cdroms\&.list\fR\&. .RE .PP ident -.RS 3n -Un outil de débogage pour rapporter l'identifiant du disque actuel ainsi que le nom du fichier stocké. +.RS 4 +Un outil de débogage pour rapporter l\'identifiant du disque actuel ainsi que le nom du fichier stocké\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-d\fR, \fB\-\-cdrom\fR -.RS 3n -Point de montage\ ; spécifie l'emplacement de montage du cédérom. Ce point de montage doit être spécifié dans +.RS 4 +Point de montage\ \&; spécifie l\'emplacement de montage du cédérom\&. Ce point de montage doit être spécifié dans \fI/etc/fstab\fR -et correctement configuré. Élément de configuration\ : -Acquire::cdrom::mount. +et correctement configuré\&. Élément de configuration\ \&: +Acquire::cdrom::mount\&. .RE .PP \fB\-r\fR, \fB\-\-rename\fR -.RS 3n -Change le nom d'un disque\ ; change le nom d'un disque ou annule le nom donné aux disques. Cette option oblige +.RS 4 +Change le nom d\'un disque\ \&; change le nom d\'un disque ou annule le nom donné aux disques\&. Cette option oblige \fBapt\-cdrom\fR -à demander un nouveau nom à l'utilisateur. Élément de configuration\ : -APT::CDROM::Rename. +à demander un nouveau nom à l\'utilisateur\&. Élément de configuration\ \&: +APT::CDROM::Rename\&. .RE .PP \fB\-m\fR, \fB\-\-no\-mount\fR -.RS 3n -Pas de montage\ ; empêche +.RS 4 +Pas de montage\ \&; empêche \fBapt\-cdrom\fR -de monter ou démonter le point de montage. Élément de configuration\ : -APT::CDROM::NoMount. +de monter ou démonter le point de montage\&. Élément de configuration\ \&: +APT::CDROM::NoMount\&. .RE .PP \fB\-f\fR, \fB\-\-fast\fR -.RS 3n -Copie rapide\ ; suppose que les paquets sont valides et ne vérifie pas chaque paquet. Cette option ne devrait être utilisée que si +.RS 4 +Copie rapide\ \&; suppose que les paquets sont valides et ne vérifie pas chaque paquet\&. Cette option ne devrait être utilisée que si \fBapt\-cdrom\fR -a préalablement utilisé ce disque et n'a trouvé aucune erreur. Élément de configuration\ : -APT::CDROM::Fast. +a préalablement utilisé ce disque et n\'a trouvé aucune erreur\&. Élément de configuration\ \&: +APT::CDROM::Fast\&. .RE .PP \fB\-a\fR, \fB\-\-thorough\fR -.RS 3n -Parcours minutieux des paquets\ ; cette option peut être nécessaire avec de vieux cédéroms de systèmes Debian 1.1 ou 1.2 dont les fichiers Packages sont situés dans des endroits étranges. Il faudra plus de temps pour parcourir le CD mais tous les paquets seront repérés. +.RS 4 +Parcours minutieux des paquets\ \&; cette option peut être nécessaire avec de vieux cédéroms de systèmes Debian 1\&.1 ou 1\&.2 dont les fichiers Packages sont situés dans des endroits étranges\&. Il faudra plus de temps pour parcourir le CD mais tous les paquets seront repérés\&. .RE .PP \fB\-n\fR, \fB\-\-just\-print\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -Aucune modification\ ; ne pas modifier le fichier -\fBsources.list\fR(5)ni les fichiers d'index. Cependant, tout est vérifié. Élément de configuration\ : -APT::CDROM::NoAct. +.RS 4 +Aucune modification\ \&; ne pas modifier le fichier +\fBsources.list\fR(5)ni les fichiers d\'index\&. Cependant, tout est vérifié\&. Élément de configuration\ \&: +APT::CDROM::NoAct\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), -\fBsources.list\fR(5). +\fBapt-get\fR(8), +\fBsources.list\fR(5)\&. .SH "DIAGNOSTICS" .PP \fBapt\-cdrom\fR -retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-config.8 b/doc/fr/apt-config.8 index a5ae260..e42fc99 100644 --- a/doc/fr/apt-config.8 +++ b/doc/fr/apt-config.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-config +.\" Title: apt-config .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,70 +11,70 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-config \- Programme pour interroger la configuration de APT +apt-config \- Programme pour interroger la configuration de APT .SH "SYNOPSIS" .HP 11 \fBapt\-config\fR [\fB\-hv\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[shell] | [dump]} .SH "DESCRIPTION" .PP \fBapt\-config\fR -est un programme interne utilisé par différentes composantes d'APT\ ; il offre la possibilité d'une configuration cohérente et permet aux applications conçues sous forme de script une utilisation simple du fichier de configuration principal -\fI/etc/apt/apt.conf\fR. +est un programme interne utilisé par différentes composantes d\'APT\ \&; il offre la possibilité d\'une configuration cohérente et permet aux applications conçues sous forme de script une utilisation simple du fichier de configuration principal +\fI/etc/apt/apt\&.conf\fR\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP shell -.RS 3n -Le terme shell est utilisé pour accéder aux informations de configuration depuis un script shell. Deux arguments doivent lui être donnés\ ; le premier est une variable du shell et le second une valeur de configuration à demander. La sortie standard consiste en une liste de commandes d'assignation de shell pour chaque valeur présente. Dans un script shell, cette commande devrait être utilisée comme suit\ : +.RS 4 +Le terme shell est utilisé pour accéder aux informations de configuration depuis un script shell\&. Deux arguments doivent lui être donnés\ \&; le premier est une variable du shell et le second une valeur de configuration à demander\&. La sortie standard consiste en une liste de commandes d\'assignation de shell pour chaque valeur présente\&. Dans un script shell, cette commande devrait être utilisée comme suit\ \&: .sp -.RS 3n +.RS 4 .nf OPTS="\-f" RES=`apt\-config shell OPTS MyApp::Options` eval $RES .fi .RE -La variable d'environnement du shell $OPTS sera définie par la valeur de MyApp::Options ou, par défaut, la valeur \-f. +La variable d\'environnement du shell $OPTS sera définie par la valeur de MyApp::Options ou, par défaut, la valeur \-f\&. .sp -L'élément de configuration peut être suivi par /[fdbi]. \(Fo\ f\ \(Fc renvoie un nom de fichier, \(Fo\ d\ \(Fc un nom de répertoire, \(Fo\ b\ \(Fc renvoie \(Fo\ true\ \(Fc ou \(Fo\ false\ \(Fc et \(Fo\ i\ \(Fc renvoie un entier. Chacune de ses valeurs est normalisée et vérifiée. +L\'élément de configuration peut être suivi par /[fdbi]\&. \(Fo\ \&f\ \&\(Fc renvoie un nom de fichier, \(Fo\ \&d\ \&\(Fc un nom de répertoire, \(Fo\ \&b\ \&\(Fc renvoie \(Fo\ \&true\ \&\(Fc ou \(Fo\ \&false\ \&\(Fc et \(Fo\ \&i\ \&\(Fc renvoie un entier\&. Chacune de ses valeurs est normalisée et vérifiée\&. .RE .PP dump -.RS 3n -Affiche seulement le contenu de l'espace de configuration. +.RS 4 +Affiche seulement le contenu de l\'espace de configuration\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -83,30 +83,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .SH "DIAGNOSTICS" .PP \fBapt\-config\fR -retourne zéro après un déroulement normal, et le nombre 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-config.fr.8 b/doc/fr/apt-config.fr.8 index a5ae260..e42fc99 100644 --- a/doc/fr/apt-config.fr.8 +++ b/doc/fr/apt-config.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-config +.\" Title: apt-config .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,70 +11,70 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-config \- Programme pour interroger la configuration de APT +apt-config \- Programme pour interroger la configuration de APT .SH "SYNOPSIS" .HP 11 \fBapt\-config\fR [\fB\-hv\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[shell] | [dump]} .SH "DESCRIPTION" .PP \fBapt\-config\fR -est un programme interne utilisé par différentes composantes d'APT\ ; il offre la possibilité d'une configuration cohérente et permet aux applications conçues sous forme de script une utilisation simple du fichier de configuration principal -\fI/etc/apt/apt.conf\fR. +est un programme interne utilisé par différentes composantes d\'APT\ \&; il offre la possibilité d\'une configuration cohérente et permet aux applications conçues sous forme de script une utilisation simple du fichier de configuration principal +\fI/etc/apt/apt\&.conf\fR\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP shell -.RS 3n -Le terme shell est utilisé pour accéder aux informations de configuration depuis un script shell. Deux arguments doivent lui être donnés\ ; le premier est une variable du shell et le second une valeur de configuration à demander. La sortie standard consiste en une liste de commandes d'assignation de shell pour chaque valeur présente. Dans un script shell, cette commande devrait être utilisée comme suit\ : +.RS 4 +Le terme shell est utilisé pour accéder aux informations de configuration depuis un script shell\&. Deux arguments doivent lui être donnés\ \&; le premier est une variable du shell et le second une valeur de configuration à demander\&. La sortie standard consiste en une liste de commandes d\'assignation de shell pour chaque valeur présente\&. Dans un script shell, cette commande devrait être utilisée comme suit\ \&: .sp -.RS 3n +.RS 4 .nf OPTS="\-f" RES=`apt\-config shell OPTS MyApp::Options` eval $RES .fi .RE -La variable d'environnement du shell $OPTS sera définie par la valeur de MyApp::Options ou, par défaut, la valeur \-f. +La variable d\'environnement du shell $OPTS sera définie par la valeur de MyApp::Options ou, par défaut, la valeur \-f\&. .sp -L'élément de configuration peut être suivi par /[fdbi]. \(Fo\ f\ \(Fc renvoie un nom de fichier, \(Fo\ d\ \(Fc un nom de répertoire, \(Fo\ b\ \(Fc renvoie \(Fo\ true\ \(Fc ou \(Fo\ false\ \(Fc et \(Fo\ i\ \(Fc renvoie un entier. Chacune de ses valeurs est normalisée et vérifiée. +L\'élément de configuration peut être suivi par /[fdbi]\&. \(Fo\ \&f\ \&\(Fc renvoie un nom de fichier, \(Fo\ \&d\ \&\(Fc un nom de répertoire, \(Fo\ \&b\ \&\(Fc renvoie \(Fo\ \&true\ \&\(Fc ou \(Fo\ \&false\ \&\(Fc et \(Fo\ \&i\ \&\(Fc renvoie un entier\&. Chacune de ses valeurs est normalisée et vérifiée\&. .RE .PP dump -.RS 3n -Affiche seulement le contenu de l'espace de configuration. +.RS 4 +Affiche seulement le contenu de l\'espace de configuration\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -83,30 +83,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .SH "DIAGNOSTICS" .PP \fBapt\-config\fR -retourne zéro après un déroulement normal, et le nombre 100 en cas d'erreur. +retourne zéro après un déroulement normal, et le nombre 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-extracttemplates.1 b/doc/fr/apt-extracttemplates.1 index fee2a53..2e18789 100644 --- a/doc/fr/apt-extracttemplates.1 +++ b/doc/fr/apt-extracttemplates.1 @@ -1,17 +1,17 @@ -.\" Title: apt\-extracttemplates +.\" Title: apt-extracttemplates .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT\-EXTRACTTEMPLATES" "1" "29 Février 2004" "Linux" "" +.TH "APT\-EXTRACTTEMPLATE" "1" "29 Février 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. +apt-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. .SH "SYNOPSIS" .HP 21 \fBapt\-extracttemplates\fR [\fB\-hv\fR] [\fB\-t=\fR\fB\fIrépertoire\ temporaire\fR\fR] \fIfichier\fR... @@ -19,84 +19,86 @@ apt\-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de .PP \fBApt\-extracttemplates\fR -prend un ou plusieurs paquets Debian en argument et renvoie (dans un répertoire temporaire) tous les scripts et guides de configuration associés. Pour chaque paquet traité contenant des scripts et guides de configuration, une ligne est affichée au format suivant\ : +prend un ou plusieurs paquets Debian en argument et renvoie (dans un répertoire temporaire) tous les scripts et guides de configuration associés\&. Pour chaque paquet traité contenant des scripts et guides de configuration, une ligne est affichée au format suivant\ \&: .PP paquet version guide\-de\-configuration script\-de\-configuration .PP -Les scripts et guides de configuration sont écrits dans le répertoire temporaire indiqué par l'option +Les scripts et guides de configuration sont écrits dans le répertoire temporaire indiqué par l\'option \fB\-t\fR ou \fB\-\-tempdir\fR -(APT::ExtractTemplates::TempDir)\ ; les noms de fichier sont de la forme -\fIpackage.template.XXXX\fR +(APT::ExtractTemplates::TempDir)\ \&; les noms de fichier sont de la forme +\fIpackage\&.template\&.XXXX\fR ou -\fIpackage.config.XXXX\fR. +\fIpackage\&.config\&.XXXX\fR\&. .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-t\fR, \fB\-\-tempdir\fR -.RS 3n -Répertoire temporaire dans lequel écrire les scripts et guides de configuration pour Debconf. Élément de configuration\ : -APT::ExtractTemplates::TempDir. +.RS 4 +Répertoire temporaire dans lequel écrire les scripts et guides de configuration pour Debconf\&. Élément de configuration\ \&: +APT::ExtractTemplates::TempDir\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-config\fR(8) +\fBapt-config\fR(8) .SH "DIAGNOSTICS" .PP \fBapt\-extracttemplates\fR -retourne zéro si tout se passe bien, le nombre 100 en cas d'erreur. +retourne zéro si tout se passe bien, le nombre 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-extracttemplates.fr.1 b/doc/fr/apt-extracttemplates.fr.1 index fee2a53..2e18789 100644 --- a/doc/fr/apt-extracttemplates.fr.1 +++ b/doc/fr/apt-extracttemplates.fr.1 @@ -1,17 +1,17 @@ -.\" Title: apt\-extracttemplates +.\" Title: apt-extracttemplates .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT\-EXTRACTTEMPLATES" "1" "29 Février 2004" "Linux" "" +.TH "APT\-EXTRACTTEMPLATE" "1" "29 Février 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. +apt-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. .SH "SYNOPSIS" .HP 21 \fBapt\-extracttemplates\fR [\fB\-hv\fR] [\fB\-t=\fR\fB\fIrépertoire\ temporaire\fR\fR] \fIfichier\fR... @@ -19,84 +19,86 @@ apt\-extracttemplates \- Un outil pour extraire d'un paquet Debian les textes de .PP \fBApt\-extracttemplates\fR -prend un ou plusieurs paquets Debian en argument et renvoie (dans un répertoire temporaire) tous les scripts et guides de configuration associés. Pour chaque paquet traité contenant des scripts et guides de configuration, une ligne est affichée au format suivant\ : +prend un ou plusieurs paquets Debian en argument et renvoie (dans un répertoire temporaire) tous les scripts et guides de configuration associés\&. Pour chaque paquet traité contenant des scripts et guides de configuration, une ligne est affichée au format suivant\ \&: .PP paquet version guide\-de\-configuration script\-de\-configuration .PP -Les scripts et guides de configuration sont écrits dans le répertoire temporaire indiqué par l'option +Les scripts et guides de configuration sont écrits dans le répertoire temporaire indiqué par l\'option \fB\-t\fR ou \fB\-\-tempdir\fR -(APT::ExtractTemplates::TempDir)\ ; les noms de fichier sont de la forme -\fIpackage.template.XXXX\fR +(APT::ExtractTemplates::TempDir)\ \&; les noms de fichier sont de la forme +\fIpackage\&.template\&.XXXX\fR ou -\fIpackage.config.XXXX\fR. +\fIpackage\&.config\&.XXXX\fR\&. .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-t\fR, \fB\-\-tempdir\fR -.RS 3n -Répertoire temporaire dans lequel écrire les scripts et guides de configuration pour Debconf. Élément de configuration\ : -APT::ExtractTemplates::TempDir. +.RS 4 +Répertoire temporaire dans lequel écrire les scripts et guides de configuration pour Debconf\&. Élément de configuration\ \&: +APT::ExtractTemplates::TempDir\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-config\fR(8) +\fBapt-config\fR(8) .SH "DIAGNOSTICS" .PP \fBapt\-extracttemplates\fR -retourne zéro si tout se passe bien, le nombre 100 en cas d'erreur. +retourne zéro si tout se passe bien, le nombre 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-ftparchive.1 b/doc/fr/apt-ftparchive.1 index 76bea5b..036ce43 100644 --- a/doc/fr/apt-ftparchive.1 +++ b/doc/fr/apt-ftparchive.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-ftparchive +.\" Title: apt-ftparchive .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-ftparchive \- Un outil pour créer des index +apt-ftparchive \- Un outil pour créer des index .SH "SYNOPSIS" .HP 15 \fBapt\-ftparchive\fR [\fB\-hvdsq\fR] [\fB\-\-md5\fR] [\fB\-\-delink\fR] [\fB\-\-readonly\fR] [\fB\-\-contents\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[packages\ \fIchemin\fR...\ [\fIoverride\fR\ [\fIpréfixe\-de\-chemin\fR]]] | [sources\ \fIchemin\fR...\ [\fIoverride\fR\ [\fIpréfixe\-de\-chemin\fR]]] | [contents\ \fIchemin\fR] | [release\ \fIchemin\fR] | [generate\ \fIfichier\-de\-configuration\fR\ \fIsection\fR...] | [clean\ \fIfichier\-de\-configuration\fR]} @@ -19,70 +19,70 @@ apt\-ftparchive \- Un outil pour cr .PP \fBapt\-ftparchive\fR -est l'outil en ligne de commande qui crée les index dont APT se sert pour accéder aux sources des distributions. Un index doit être créé pour un site et basé sur le contenu de ce site. +est l\'outil en ligne de commande qui crée les index dont APT se sert pour accéder aux sources des distributions\&. Un index doit être créé pour un site et basé sur le contenu de ce site\&. .PP \fBapt\-ftparchive\fR est un ensemble comprenant le programme -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) et toutes ses fonctionnalités via la commande -packages\ ; il comprend aussi un générateur de fichier \(Fo\ Contents\ \(Fc, la commande -contents, et une technique élaborée pour \(Fo\ scripter\ \(Fc le processus de création d'une archive complète. +packages\ \&; il comprend aussi un générateur de fichier \(Fo\ \&Contents\ \&\(Fc, la commande +contents, et une technique élaborée pour \(Fo\ \&scripter\ \&\(Fc le processus de création d\'une archive complète\&. .PP \fBApt\-ftparchive\fR -peut utiliser lui\-même des bases de données binaires pour \(Fo\ cacher\ \(Fc le contenu d'un fichier .deb\ ; il n'a pas besoin de programmes extérieurs, sauf -\fBgzip\fR(1). Lors d'une exécution, il vérifie les changements dans les fichiers et crée les fichiers compressés voulus. +peut utiliser lui\-même des bases de données binaires pour \(Fo\ \&cacher\ \&\(Fc le contenu d\'un fichier \&.deb\ \&; il n\'a pas besoin de programmes extérieurs, sauf +\fBgzip\fR(1)\&. Lors d\'une exécution, il vérifie les changements dans les fichiers et crée les fichiers compressés voulus\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente\ : +ne soit donnée, l\'une des commandes suivantes doit être présente\ \&: .PP packages -.RS 3n +.RS 4 La commande packages -crée un fichier \(Fo\ Packages\ \(Fc à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .deb et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette commande est approximativement équivalente à -\fBdpkg\-scanpackages\fR(8). +crée un fichier \(Fo\ \&Packages\ \&\(Fc à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.deb et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard\&. Cette commande est approximativement équivalente à +\fBdpkg-scanpackages\fR(8)\&. .sp -On peut se servir de l'option +On peut se servir de l\'option \fB\-\-db\fR -pour demander un cache binaire. +pour demander un cache binaire\&. .RE .PP sources -.RS 3n +.RS 4 La commande sources -crée un index des sources à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .dsc et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette commande est approximativement équivalente à -\fBdpkg\-scansources\fR(8). +crée un index des sources à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.dsc et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard\&. Cette commande est approximativement équivalente à +\fBdpkg-scansources\fR(8)\&. .sp -Quand on précise un fichier \(Fo\ override\ \(Fc, c'est un fichier source avec une extension .src qui est recherché. On peut se servir de l'option +Quand on précise un fichier \(Fo\ \&override\ \&\(Fc, c\'est un fichier source avec une extension \&.src qui est recherché\&. On peut se servir de l\'option \fB\-\-source\-override\fR -pour changer de fichier source d'\(Fo\ override\ \(Fc. +pour changer de fichier source d\'\(Fo\ \&override\ \&\(Fc\&. .RE .PP contents -.RS 3n +.RS 4 La commande contents -crée un fichier \(Fo\ Contents\ \(Fc à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .deb et, pour chaque fichier trouvé, lit la liste des fichiers. Elle trie la liste des fichiers correspondant à des paquets et l'envoie sur la sortie standard. Les répertoires ne font pas partie du résultat. Quand un fichier appartient à plusieurs paquets, une virgule sépare les paquets. +crée un fichier \(Fo\ \&Contents\ \&\(Fc à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.deb et, pour chaque fichier trouvé, lit la liste des fichiers\&. Elle trie la liste des fichiers correspondant à des paquets et l\'envoie sur la sortie standard\&. Les répertoires ne font pas partie du résultat\&. Quand un fichier appartient à plusieurs paquets, une virgule sépare les paquets\&. .sp -On peut se servir de l'option +On peut se servir de l\'option \fB\-\-db\fR -pour demander un cache binaire. +pour demander un cache binaire\&. .RE .PP release -.RS 3n +.RS 4 La commande release -crée un fichier Releases à partir d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier. +crée un fichier Releases à partir d\'un répertoire\&. Elle cherche récursivement dans ce répertoire les fichiers Packages, Packages\&.gz, Packages\&.bz2, Sources, Sources\&.gz, Sources\&.bz2, Release et md5sum\&.txt\&. Elle envoie alors un fichier Release sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier\&. .sp La valeur des autres champs du fichier Release est tirée de la valeur correspondante dans -APT::FTPArchive::Release, p. ex. -APT::FTPArchive::Release::Origin. Les champs reconnus sont : +APT::FTPArchive::Release, p\&. ex\&. +APT::FTPArchive::Release::Origin\&. Les champs reconnus sont : Origin, Label, Suite, @@ -91,311 +91,311 @@ Codename, Date, Architectures, Components, -Description. +Description\&. .RE .PP generate -.RS 3n +.RS 4 La commande generate -est conçue pour être exécutable par le programme cron et elle crée un index en suivant le fichier de configuration donné. Le langage de configuration fournit un moyen souple de préciser index et répertoires aussi bien que les paramètres requis. +est conçue pour être exécutable par le programme cron et elle crée un index en suivant le fichier de configuration donné\&. Le langage de configuration fournit un moyen souple de préciser index et répertoires aussi bien que les paramètres requis\&. .RE .PP clean -.RS 3n +.RS 4 La commande clean -range les bases de données utilisées par le fichier de configuration en supprimant les enregistrements qui ne sont plus nécessaires. +range les bases de données utilisées par le fichier de configuration en supprimant les enregistrements qui ne sont plus nécessaires\&. .RE .SH "CONFIGURATION DE LA COMMANDE GENERATE" .PP La commande generate -utilise un fichier de configuration pour décrire l'archive qui va être créée. Le format de ce fichier est le format ISC classique utilisé par des outils ISC comme bind 8 et dhcpd. Le fichier +utilise un fichier de configuration pour décrire l\'archive qui va être créée\&. Le format de ce fichier est le format ISC classique utilisé par des outils ISC comme bind 8 et dhcpd\&. Le fichier \fBapt.conf\fR(5) -décrit ce format. Il faut noter que l'analyse de ce fichier se fait par section tandis que celle d'\fBapt.conf\fR(5) -se fait par arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag). +décrit ce format\&. Il faut noter que l\'analyse de ce fichier se fait par section tandis que celle d\'\fBapt.conf\fR(5) +se fait par arborescence\&. Cela n\'affecte que l\'usage de l\'étiquette de visée (scope tag)\&. .PP -Ce fichier de configuration possède quatre sections, décrites ci\-dessous. +Ce fichier de configuration possède quatre sections, décrites ci\-dessous\&. .SS "La section Dir" .PP La section Dir -définit les répertoires standards où situer les fichiers nécessaires au processus de création. Ces répertoires sont précédés de chemins relatifs définis dans les sections suivantes de manière à produire un chemin absolu et complet. +définit les répertoires standards où situer les fichiers nécessaires au processus de création\&. Ces répertoires sont précédés de chemins relatifs définis dans les sections suivantes de manière à produire un chemin absolu et complet\&. .PP ArchiveDir -.RS 3n -Indique la racine de l'archive FTP\ ; Pour une configuration Debian classique, c'est le répertoire qui contient le fichier +.RS 4 +Indique la racine de l\'archive FTP\ \&; Pour une configuration Debian classique, c\'est le répertoire qui contient le fichier \fIls\-LR\fR -et les noeuds des distributions. +et les noeuds des distributions\&. .RE .PP OverrideDir -.RS 3n -Indique l'emplacement des fichiers d'\(Fo\ override\ \(Fc. +.RS 4 +Indique l\'emplacement des fichiers d\'\(Fo\ \&override\ \&\(Fc\&. .RE .PP CacheDir -.RS 3n -Indique l'emplacement des fichiers de cache. +.RS 4 +Indique l\'emplacement des fichiers de cache\&. .RE .PP FileListDir -.RS 3n -Indique l'emplacement des fichiers contenant la liste des fichiers (si on se sert de la valeur +.RS 4 +Indique l\'emplacement des fichiers contenant la liste des fichiers (si on se sert de la valeur FileList -définie plus bas). +définie plus bas)\&. .RE .SS "La section Default" .PP La section Default -précise les valeurs par défaut et les paramètres qui contrôlent la marche du générateur. Ces valeurs peuvent être annulées dans d'autres sections (paramètrage par section). +précise les valeurs par défaut et les paramètres qui contrôlent la marche du générateur\&. Ces valeurs peuvent être annulées dans d\'autres sections (paramètrage par section)\&. .PP Packages::Compress -.RS 3n -Indique comment sont compressés les fichiers d'index. C'est une chaîne qui contient des valeurs séparées par des espaces\ ; elle contient au moins l'une des valeurs suivantes\ : \(Fo\ .\ \(Fc (pas de compression), \(Fo\ gzip\ \(Fc, \(Fo\ bzip2\ \(Fc. Par défaut, c'est la chaîne \(Fo\ . gzip\ \(Fc. +.RS 4 +Indique comment sont compressés les fichiers d\'index\&. C\'est une chaîne qui contient des valeurs séparées par des espaces\ \&; elle contient au moins l\'une des valeurs suivantes\ \&: \(Fo\ \&\&.\ \&\(Fc (pas de compression), \(Fo\ \&gzip\ \&\(Fc, \(Fo\ \&bzip2\ \&\(Fc\&. Par défaut, c\'est la chaîne \(Fo\ \&\&. gzip\ \&\(Fc\&. .RE .PP Packages::Extensions -.RS 3n -Indique la liste par défaut des extensions de fichier qui constituent des paquets. Par défaut, c'est \(Fo\ .deb\ \(Fc. +.RS 4 +Indique la liste par défaut des extensions de fichier qui constituent des paquets\&. Par défaut, c\'est \(Fo\ \&\&.deb\ \&\(Fc\&. .RE .PP Sources::Compress -.RS 3n +.RS 4 Identique à Packages::Compress -mais précise comment sont compressés les fichiers sources. +mais précise comment sont compressés les fichiers sources\&. .RE .PP Sources::Extensions -.RS 3n -Indique la liste par défaut des extensions de fichier qui constituent des fichiers sources. Par défaut, c'est \(Fo\ .dsc\ \(Fc. +.RS 4 +Indique la liste par défaut des extensions de fichier qui constituent des fichiers sources\&. Par défaut, c\'est \(Fo\ \&\&.dsc\ \&\(Fc\&. .RE .PP Contents::Compress -.RS 3n +.RS 4 Identique à Packages::Compress -mais précise comment sont compressés les fichiers \(Fo\ Contents\ \(Fc. +mais précise comment sont compressés les fichiers \(Fo\ \&Contents\ \&\(Fc\&. .RE .PP DeLinkLimit -.RS 3n -Indique le nombre de kilooctets à délier (et à remplacer par des liens en dur) pour chaque exécution. On s'en sert, pour chaque section, avec le paramètre -External\-Links. +.RS 4 +Indique le nombre de kilooctets à délier (et à remplacer par des liens en dur) pour chaque exécution\&. On s\'en sert, pour chaque section, avec le paramètre +External\-Links\&. .RE .PP FileMode -.RS 3n -Indique le système de permissions des fichiers d'index créés. Par défaut, c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque utilisateur (umasq) est ignoré. +.RS 4 +Indique le système de permissions des fichiers d\'index créés\&. Par défaut, c\'est le mode 0644\&. Tous les fichiers d\'index ont ce mode et le masque utilisateur (umasq) est ignoré\&. .RE .SS "La section TreeDefault" .PP On indique les valeurs par défaut particulières à la section -Tree. Toutes ces variables sont des variables de substitution\ ; les chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur respective. +Tree\&. Toutes ces variables sont des variables de substitution\ \&; les chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur respective\&. .PP MaxContentsChange -.RS 3n -Indique le nombre de kilooctets de fichiers \(Fo\ Contents\ \(Fc qui sont créés chaque jour. Les fichiers \(Fo\ Contents\ \(Fc sont tirés au sort selon le système +.RS 4 +Indique le nombre de kilooctets de fichiers \(Fo\ \&Contents\ \&\(Fc qui sont créés chaque jour\&. Les fichiers \(Fo\ \&Contents\ \&\(Fc sont tirés au sort selon le système \fIround\-robin\fR -de manière que, sur plusieurs jours, tous soient reconstruits. +de manière que, sur plusieurs jours, tous soient reconstruits\&. .RE .PP ContentsAge -.RS 3n -Contrôle le nombre de jours pendant lequel un fichier \(Fo\ Contents\ \(Fc peut être utilisé sans actualisation. Quand cette limite est franchie, le \(Fo\ mtime\ \(Fc du fichier \(Fo\ Contents\ \(Fc est mis à jour. Cela peut arriver quand un fichier est modifié sans que cela modifie le fichier \(Fo\ Contents\ \(Fc (modification par \(Fo\ override\ \(Fc par exemple). Un délai est permis dans l'espoir que de nouveaux \(Fo\ .deb\ \(Fc seront installés, exigeant un nouveau \(Fo\ Contents\ \(Fc. Par défaut ce nombre vaut 10, l'unité étant le jour. +.RS 4 +Contrôle le nombre de jours pendant lequel un fichier \(Fo\ \&Contents\ \&\(Fc peut être utilisé sans actualisation\&. Quand cette limite est franchie, le \(Fo\ \&mtime\ \&\(Fc du fichier \(Fo\ \&Contents\ \&\(Fc est mis à jour\&. Cela peut arriver quand un fichier est modifié sans que cela modifie le fichier \(Fo\ \&Contents\ \&\(Fc (modification par \(Fo\ \&override\ \&\(Fc par exemple)\&. Un délai est permis dans l\'espoir que de nouveaux \(Fo\ \&\&.deb\ \&\(Fc seront installés, exigeant un nouveau \(Fo\ \&Contents\ \&\(Fc\&. Par défaut ce nombre vaut 10, l\'unité étant le jour\&. .RE .PP Directory -.RS 3n -Indique la racine de l'arborescence des \(Fo\ .deb\ \(Fc. Par défaut, c'est -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR. +.RS 4 +Indique la racine de l\'arborescence des \(Fo\ \&\&.deb\ \&\(Fc\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR\&. .RE .PP SrcDirectory -.RS 3n -Indique la racine de l'arborescence des paquets source. Par défaut, c'est -\fI$(DIST)/$(SECTION)/source/\fR. +.RS 4 +Indique la racine de l\'arborescence des paquets source\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/source/\fR\&. .RE .PP Packages -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc créé. Par défaut, c'est -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc créé\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR\&. .RE .PP Sources -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc crée. Par défaut, c'est -\fI$(DIST)/$(SECTION)/source/Sources\fR. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc crée\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/source/Sources\fR\&. .RE .PP InternalPrefix -.RS 3n -Indique un préfixe de chemin\ ; ce préfixe fait qu'un lien symbolique sera considéré comme un lien interne plutôt que comme un lien externe. Par défaut, c'est -\fI$(DIST)/$(SECTION)/\fR. +.RS 4 +Indique un préfixe de chemin\ \&; ce préfixe fait qu\'un lien symbolique sera considéré comme un lien interne plutôt que comme un lien externe\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/\fR\&. .RE .PP Contents -.RS 3n -Indique le fichier \(Fo\ Contents\ \(Fc créé. Par défaut, c'est -\fI$(DIST)/Contents\-$(ARCH)\fR. Quand le paramètrage fait que différents fichiers \(Fo\ Packages\ \(Fc se réfèrent à un seul fichier \(Fo\ Contents\ \(Fc, +.RS 4 +Indique le fichier \(Fo\ \&Contents\ \&\(Fc créé\&. Par défaut, c\'est +\fI$(DIST)/Contents\-$(ARCH)\fR\&. Quand le paramètrage fait que différents fichiers \(Fo\ \&Packages\ \&\(Fc se réfèrent à un seul fichier \(Fo\ \&Contents\ \&\(Fc, \fBapt\-ftparchive\fR -les intègre automatiquement. +les intègre automatiquement\&. .RE .PP Contents::Header -.RS 3n -Indique l'en\-tête à préfixer au fichier \(Fo\ Contents\ \(Fc créé. +.RS 4 +Indique l\'en\-tête à préfixer au fichier \(Fo\ \&Contents\ \&\(Fc créé\&. .RE .PP BinCacheDB -.RS 3n -Indique la base de données binaire servant de cache pour cette section. Différentes sections peuvent partager cette base de données. +.RS 4 +Indique la base de données binaire servant de cache pour cette section\&. Différentes sections peuvent partager cette base de données\&. .RE .PP FileList -.RS 3n -Indique qu'au lieu de lire l'arborescence, +.RS 4 +Indique qu\'au lieu de lire l\'arborescence, \fBapt\-ftparchive\fR -doit lire la liste de fichiers dans le fichier donné en argument. Les noms relatifs sont préfixés par le répertoire de l'archive. +doit lire la liste de fichiers dans le fichier donné en argument\&. Les noms relatifs sont préfixés par le répertoire de l\'archive\&. .RE .PP SourceFileList -.RS 3n -Indique qu'au lieu de lire l'arborescence, +.RS 4 +Indique qu\'au lieu de lire l\'arborescence, \fBapt\-ftparchive\fR -doit lire la liste de fichiers dans le fichier donné en argument. Les noms relatifs sont préfixés par le répertoire de l'archive. On s'en sert pour traiter les index de sources. +doit lire la liste de fichiers dans le fichier donné en argument\&. Les noms relatifs sont préfixés par le répertoire de l\'archive\&. On s\'en sert pour traiter les index de sources\&. .RE .SS "La section Tree" .PP La section Tree -définit une arborescence debian classique avec un répertoire de base, différentes sections dans ce répertoire et différentes architectures dans chaque section. Le chemin exact est défini par la variable de substitution -Directory. +définit une arborescence debian classique avec un répertoire de base, différentes sections dans ce répertoire et différentes architectures dans chaque section\&. Le chemin exact est défini par la variable de substitution +Directory\&. .PP La section Tree accepte une étiquette de visée (scope tag) qui détermine la variable $(DIST) -et la racine de l'arborescence (le chemin est préfixé par -ArchiveDir). C'est par exemple\ : -\fIdists/woody\fR. +et la racine de l\'arborescence (le chemin est préfixé par +ArchiveDir)\&. C\'est par exemple\ \&: +\fIdists/woody\fR\&. .PP Tous les paramètres définis dans la section TreeDefault -peuvent s'utiliser dans la section +peuvent s\'utiliser dans la section Tree -ainsi que les trois nouvelles variables suivantes. +ainsi que les trois nouvelles variables suivantes\&. .PP Quand il exécute la section Tree, \fBapt\-ftparchive\fR -agit ainsi\ : -.sp .RS 3n .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE +agit ainsi\ \&: +.sp .RS 4 .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE .PP Sections -.RS 3n -C'est une liste de sections séparées par des espaces qui appartiennent à une distribution\ ; classiquement, on trouve -main contrib non\-free. +.RS 4 +C\'est une liste de sections séparées par des espaces qui appartiennent à une distribution\ \&; classiquement, on trouve +main contrib non\-free\&. .RE .PP Architectures -.RS 3n -C'est une liste de toutes les architectures qui appartiennent à chaque section. L'architecture spéciale \(Fo\ source\ \(Fc indique que l'arborescence est une arborescence de sources. +.RS 4 +C\'est une liste de toutes les architectures qui appartiennent à chaque section\&. L\'architecture spéciale \(Fo\ \&source\ \&\(Fc indique que l\'arborescence est une arborescence de sources\&. .RE .PP BinOverride -.RS 3n -Indique le fichier binaire d'\(Fo\ override\ \(Fc. Ce fichier contient des informations sur la section, la priorité et le responsable du paquet. +.RS 4 +Indique le fichier binaire d\'\(Fo\ \&override\ \&\(Fc\&. Ce fichier contient des informations sur la section, la priorité et le responsable du paquet\&. .RE .PP SrcOverride -.RS 3n -Indique le fichier source d'\(Fo\ override\ \(Fc. Ce fichier contient des informations sur la section. +.RS 4 +Indique le fichier source d\'\(Fo\ \&override\ \&\(Fc\&. Ce fichier contient des informations sur la section\&. .RE .PP ExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .SS "La section BinDirectory" .PP La section bindirectory -définit une arborescence binaire sans structure particulière. L'étiquette de visée (scope tag) indique l'emplacement du répertoire binaire et le paramètrage est identique à celui pour la section +définit une arborescence binaire sans structure particulière\&. L\'étiquette de visée (scope tag) indique l\'emplacement du répertoire binaire et le paramètrage est identique à celui pour la section Tree sans substitution de variables ou au paramètrage de -SectionArchitecture. +SectionArchitecture\&. .PP Packages -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc créé. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc créé\&. .RE .PP Sources -.RS 3n -Indique le fichier \(Fo\ Sources\ \(Fc créé. L'un des deux fichiers, +.RS 4 +Indique le fichier \(Fo\ \&Sources\ \&\(Fc créé\&. L\'un des deux fichiers, Packages ou Sources -est nécessaire. +est nécessaire\&. .RE .PP Contents -.RS 3n -Indique le fichier \(Fo\ Contents\ \(Fc créé. +.RS 4 +Indique le fichier \(Fo\ \&Contents\ \&\(Fc créé\&. .RE .PP Binoverride -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcOverride -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .PP ExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .PP BinCacheDB -.RS 3n -Indique une base de données cache. +.RS 4 +Indique une base de données cache\&. .RE .PP PathPrefix -.RS 3n -Ajoute un chemin à tous les chemins créés. +.RS 4 +Ajoute un chemin à tous les chemins créés\&. .RE .PP FileList, SourceFileList -.RS 3n -Indique le fichier contenant la liste des fichiers. +.RS 4 +Indique le fichier contenant la liste des fichiers\&. .RE -.SH "LE FICHIER D'\(Fo\ OVERRIDE\ \(Fc POUR LES BINAIRES." +.SH "LE FICHIER D'\(Fo\ \&OVERRIDE\ \&\(Fc POUR LES BINAIRES." .PP -Le fichier d'\(Fo\ Override\ \(Fc est pleinement compatible avec -\fBdpkg\-scanpackages\fR(8). Il contient quatre champs séparés par des espaces. Le premier est le nom du paquet\ ; le deuxième est la priorité à donner à ce paquet\ ; le troisième est sa section et le dernier champ est un champ pour changer le nom du responsable de paquet. +Le fichier d\'\(Fo\ \&Override\ \&\(Fc est pleinement compatible avec +\fBdpkg-scanpackages\fR(8)\&. Il contient quatre champs séparés par des espaces\&. Le premier est le nom du paquet\ \&; le deuxième est la priorité à donner à ce paquet\ \&; le troisième est sa section et le dernier champ est un champ pour changer le nom du responsable de paquet\&. .PP -Le champ du responsable est de cette forme\ : +Le champ du responsable est de cette forme\ \&: .sp -.RS 3n +.RS 4 .nf old [// oldn]* => new .fi @@ -403,96 +403,96 @@ old [// oldn]* => new .sp ou simplement, .sp -.RS 3n +.RS 4 .nf new .fi .RE .sp -La première forme permet de spécifier de vieilles adresses dans une liste (le séparateur est la double barre oblique). Si l'une de ces deux formes est rencontrée, la valeur de new remplace la valeur du champ. La deuxième forme remplace inconditionnellement le champ. -.SH "LE FICHIER D'\(Fo\ OVERRIDE\ \(Fc POUR LES SOURCES" +La première forme permet de spécifier de vieilles adresses dans une liste (le séparateur est la double barre oblique)\&. Si l\'une de ces deux formes est rencontrée, la valeur de new remplace la valeur du champ\&. La deuxième forme remplace inconditionnellement le champ\&. +.SH "LE FICHIER D'\(Fo\ \&OVERRIDE\ \&\(Fc POUR LES SOURCES" .PP -Le fichier d'\(Fo\ Override\ \(Fc est pleinement compatible avec -\fBdpkg\-scansources\fR(8). Il contient deux champs. Le premier est le nom du paquet source\ ; le second, sa section. -.SH "LE FICHIER SUPPLÉMENTAIRE D'\(Fo\ OVERRIDE\ \(Fc" +Le fichier d\'\(Fo\ \&Override\ \&\(Fc est pleinement compatible avec +\fBdpkg-scansources\fR(8)\&. Il contient deux champs\&. Le premier est le nom du paquet source\ \&; le second, sa section\&. +.SH "LE FICHIER SUPPLÉMENTAIRE D'\(Fo\ \&OVERRIDE\ \&\(Fc" .PP -Le fichier supplémentaire d'\(Fo\ Override\ \(Fc permet d'ajouter ou de remplacer des étiquettes sur la sortie. Il possède trois colonnes\ : la première représente le paquet, la seconde est une étiquette et la troisième en fin de ligne est la nouvelle valeur. +Le fichier supplémentaire d\'\(Fo\ \&Override\ \&\(Fc permet d\'ajouter ou de remplacer des étiquettes sur la sortie\&. Il possède trois colonnes\ \&: la première représente le paquet, la seconde est une étiquette et la troisième en fin de ligne est la nouvelle valeur\&. .SH "LES OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-\-md5\fR -.RS 3n -Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où c'est possible. Élément de configuration\ : -APT::FTPArchive::MD5. +.RS 4 +Créer la somme de contrôle MD5\&. Cette option est activée par défaut\&. Quand elle est désactivée, les fichiers d\'index n\'ont pas les champs MD5Sum là où c\'est possible\&. Élément de configuration\ \&: +APT::FTPArchive::MD5\&. .RE .PP \fB\-d\fR, \fB\-\-db\fR -.RS 3n -Utiliser une base de données binaire pour cache. Cela n'a aucun effet sur la commande generate. Élément de configuration\ : -APT::FTPArchive::DB. +.RS 4 +Utiliser une base de données binaire pour cache\&. Cela n\'a aucun effet sur la commande generate\&. Élément de configuration\ \&: +APT::FTPArchive::DB\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; cette commande produit une sortie destinée à l'enregistrement dans un fichier\-journal en omettant les indicateurs de progression. Un plus grand nombre de \(Fo\ q\ \(Fc (2 au plus) produit un plus grand silence. On peut aussi utiliser +.RS 4 +Mode silencieux\ \&; cette commande produit une sortie destinée à l\'enregistrement dans un fichier\-journal en omettant les indicateurs de progression\&. Un plus grand nombre de \(Fo\ \&q\ \&\(Fc (2 au plus) produit un plus grand silence\&. On peut aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, et annuler le fichier de configuration. Élément de configuration\ : -quiet. +pour positionner le niveau de silence, et annuler le fichier de configuration\&. Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-\-delink\fR -.RS 3n -Faire une déliaison. Si +.RS 4 +Faire une déliaison\&. Si External\-Links -est activé, cette option permet réellement la déliaison des fichiers. Par défaut, elle est activée mais elle peut être désactivée avec l'option -\fB\-\-no\-delink\fR. Élément de configuration\ : -APT::FTPArchive::DeLinkAct. +est activé, cette option permet réellement la déliaison des fichiers\&. Par défaut, elle est activée mais elle peut être désactivée avec l\'option +\fB\-\-no\-delink\fR\&. Élément de configuration\ \&: +APT::FTPArchive::DeLinkAct\&. .RE .PP \fB\-\-contents\fR -.RS 3n -Permettre la création d'un fichier \(Fo\ Contents\ \(Fc. Quand cette option est activée et que les index sont créés sous forme de base de données binaire, la liste des fichiers est aussi extraite et conservée dans la base de données pour un usage futur. Avec la commande generate, cette option permet la création de fichiers \(Fo\ Contents\ \(Fc. Par défaut, elle est activée. Élément de configuration\ : -APT::FTPArchive::Contents. +.RS 4 +Permettre la création d\'un fichier \(Fo\ \&Contents\ \&\(Fc\&. Quand cette option est activée et que les index sont créés sous forme de base de données binaire, la liste des fichiers est aussi extraite et conservée dans la base de données pour un usage futur\&. Avec la commande generate, cette option permet la création de fichiers \(Fo\ \&Contents\ \&\(Fc\&. Par défaut, elle est activée\&. Élément de configuration\ \&: +APT::FTPArchive::Contents\&. .RE .PP \fB\-s\fR, \fB\-\-source\-override\fR -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc à utiliser avec la commande -sources. Élément de configuration\ : -APT::FTPArchive::SourceOverride. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc à utiliser avec la commande +sources\&. Élément de configuration\ \&: +APT::FTPArchive::SourceOverride\&. .RE .PP \fB\-\-readonly\fR -.RS 3n -N'autoriser que la lecture pour les bases de données de cache. Élément de configuration\ : -APT::FTPArchive::ReadOnlyDB. +.RS 4 +N\'autoriser que la lecture pour les bases de données de cache\&. Élément de configuration\ \&: +APT::FTPArchive::ReadOnlyDB\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -501,30 +501,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .PP \fBapt\-ftparchive\fR -retourne zéro si tout se passe bien, le nombre décimal 100 en cas d'erreur. +retourne zéro si tout se passe bien, le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-ftparchive.fr.1 b/doc/fr/apt-ftparchive.fr.1 index 76bea5b..036ce43 100644 --- a/doc/fr/apt-ftparchive.fr.1 +++ b/doc/fr/apt-ftparchive.fr.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-ftparchive +.\" Title: apt-ftparchive .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-ftparchive \- Un outil pour créer des index +apt-ftparchive \- Un outil pour créer des index .SH "SYNOPSIS" .HP 15 \fBapt\-ftparchive\fR [\fB\-hvdsq\fR] [\fB\-\-md5\fR] [\fB\-\-delink\fR] [\fB\-\-readonly\fR] [\fB\-\-contents\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[packages\ \fIchemin\fR...\ [\fIoverride\fR\ [\fIpréfixe\-de\-chemin\fR]]] | [sources\ \fIchemin\fR...\ [\fIoverride\fR\ [\fIpréfixe\-de\-chemin\fR]]] | [contents\ \fIchemin\fR] | [release\ \fIchemin\fR] | [generate\ \fIfichier\-de\-configuration\fR\ \fIsection\fR...] | [clean\ \fIfichier\-de\-configuration\fR]} @@ -19,70 +19,70 @@ apt\-ftparchive \- Un outil pour cr .PP \fBapt\-ftparchive\fR -est l'outil en ligne de commande qui crée les index dont APT se sert pour accéder aux sources des distributions. Un index doit être créé pour un site et basé sur le contenu de ce site. +est l\'outil en ligne de commande qui crée les index dont APT se sert pour accéder aux sources des distributions\&. Un index doit être créé pour un site et basé sur le contenu de ce site\&. .PP \fBapt\-ftparchive\fR est un ensemble comprenant le programme -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) et toutes ses fonctionnalités via la commande -packages\ ; il comprend aussi un générateur de fichier \(Fo\ Contents\ \(Fc, la commande -contents, et une technique élaborée pour \(Fo\ scripter\ \(Fc le processus de création d'une archive complète. +packages\ \&; il comprend aussi un générateur de fichier \(Fo\ \&Contents\ \&\(Fc, la commande +contents, et une technique élaborée pour \(Fo\ \&scripter\ \&\(Fc le processus de création d\'une archive complète\&. .PP \fBApt\-ftparchive\fR -peut utiliser lui\-même des bases de données binaires pour \(Fo\ cacher\ \(Fc le contenu d'un fichier .deb\ ; il n'a pas besoin de programmes extérieurs, sauf -\fBgzip\fR(1). Lors d'une exécution, il vérifie les changements dans les fichiers et crée les fichiers compressés voulus. +peut utiliser lui\-même des bases de données binaires pour \(Fo\ \&cacher\ \&\(Fc le contenu d\'un fichier \&.deb\ \&; il n\'a pas besoin de programmes extérieurs, sauf +\fBgzip\fR(1)\&. Lors d\'une exécution, il vérifie les changements dans les fichiers et crée les fichiers compressés voulus\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente\ : +ne soit donnée, l\'une des commandes suivantes doit être présente\ \&: .PP packages -.RS 3n +.RS 4 La commande packages -crée un fichier \(Fo\ Packages\ \(Fc à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .deb et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette commande est approximativement équivalente à -\fBdpkg\-scanpackages\fR(8). +crée un fichier \(Fo\ \&Packages\ \&\(Fc à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.deb et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard\&. Cette commande est approximativement équivalente à +\fBdpkg-scanpackages\fR(8)\&. .sp -On peut se servir de l'option +On peut se servir de l\'option \fB\-\-db\fR -pour demander un cache binaire. +pour demander un cache binaire\&. .RE .PP sources -.RS 3n +.RS 4 La commande sources -crée un index des sources à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .dsc et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette commande est approximativement équivalente à -\fBdpkg\-scansources\fR(8). +crée un index des sources à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.dsc et, pour chaque fichier trouvé, envoie une entrée pour ce paquet sur la sortie standard\&. Cette commande est approximativement équivalente à +\fBdpkg-scansources\fR(8)\&. .sp -Quand on précise un fichier \(Fo\ override\ \(Fc, c'est un fichier source avec une extension .src qui est recherché. On peut se servir de l'option +Quand on précise un fichier \(Fo\ \&override\ \&\(Fc, c\'est un fichier source avec une extension \&.src qui est recherché\&. On peut se servir de l\'option \fB\-\-source\-override\fR -pour changer de fichier source d'\(Fo\ override\ \(Fc. +pour changer de fichier source d\'\(Fo\ \&override\ \&\(Fc\&. .RE .PP contents -.RS 3n +.RS 4 La commande contents -crée un fichier \(Fo\ Contents\ \(Fc à partir d'une arborescence. Elle recherche récursivement à travers le répertoire donné les fichiers .deb et, pour chaque fichier trouvé, lit la liste des fichiers. Elle trie la liste des fichiers correspondant à des paquets et l'envoie sur la sortie standard. Les répertoires ne font pas partie du résultat. Quand un fichier appartient à plusieurs paquets, une virgule sépare les paquets. +crée un fichier \(Fo\ \&Contents\ \&\(Fc à partir d\'une arborescence\&. Elle recherche récursivement à travers le répertoire donné les fichiers \&.deb et, pour chaque fichier trouvé, lit la liste des fichiers\&. Elle trie la liste des fichiers correspondant à des paquets et l\'envoie sur la sortie standard\&. Les répertoires ne font pas partie du résultat\&. Quand un fichier appartient à plusieurs paquets, une virgule sépare les paquets\&. .sp -On peut se servir de l'option +On peut se servir de l\'option \fB\-\-db\fR -pour demander un cache binaire. +pour demander un cache binaire\&. .RE .PP release -.RS 3n +.RS 4 La commande release -crée un fichier Releases à partir d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier. +crée un fichier Releases à partir d\'un répertoire\&. Elle cherche récursivement dans ce répertoire les fichiers Packages, Packages\&.gz, Packages\&.bz2, Sources, Sources\&.gz, Sources\&.bz2, Release et md5sum\&.txt\&. Elle envoie alors un fichier Release sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier\&. .sp La valeur des autres champs du fichier Release est tirée de la valeur correspondante dans -APT::FTPArchive::Release, p. ex. -APT::FTPArchive::Release::Origin. Les champs reconnus sont : +APT::FTPArchive::Release, p\&. ex\&. +APT::FTPArchive::Release::Origin\&. Les champs reconnus sont : Origin, Label, Suite, @@ -91,311 +91,311 @@ Codename, Date, Architectures, Components, -Description. +Description\&. .RE .PP generate -.RS 3n +.RS 4 La commande generate -est conçue pour être exécutable par le programme cron et elle crée un index en suivant le fichier de configuration donné. Le langage de configuration fournit un moyen souple de préciser index et répertoires aussi bien que les paramètres requis. +est conçue pour être exécutable par le programme cron et elle crée un index en suivant le fichier de configuration donné\&. Le langage de configuration fournit un moyen souple de préciser index et répertoires aussi bien que les paramètres requis\&. .RE .PP clean -.RS 3n +.RS 4 La commande clean -range les bases de données utilisées par le fichier de configuration en supprimant les enregistrements qui ne sont plus nécessaires. +range les bases de données utilisées par le fichier de configuration en supprimant les enregistrements qui ne sont plus nécessaires\&. .RE .SH "CONFIGURATION DE LA COMMANDE GENERATE" .PP La commande generate -utilise un fichier de configuration pour décrire l'archive qui va être créée. Le format de ce fichier est le format ISC classique utilisé par des outils ISC comme bind 8 et dhcpd. Le fichier +utilise un fichier de configuration pour décrire l\'archive qui va être créée\&. Le format de ce fichier est le format ISC classique utilisé par des outils ISC comme bind 8 et dhcpd\&. Le fichier \fBapt.conf\fR(5) -décrit ce format. Il faut noter que l'analyse de ce fichier se fait par section tandis que celle d'\fBapt.conf\fR(5) -se fait par arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag). +décrit ce format\&. Il faut noter que l\'analyse de ce fichier se fait par section tandis que celle d\'\fBapt.conf\fR(5) +se fait par arborescence\&. Cela n\'affecte que l\'usage de l\'étiquette de visée (scope tag)\&. .PP -Ce fichier de configuration possède quatre sections, décrites ci\-dessous. +Ce fichier de configuration possède quatre sections, décrites ci\-dessous\&. .SS "La section Dir" .PP La section Dir -définit les répertoires standards où situer les fichiers nécessaires au processus de création. Ces répertoires sont précédés de chemins relatifs définis dans les sections suivantes de manière à produire un chemin absolu et complet. +définit les répertoires standards où situer les fichiers nécessaires au processus de création\&. Ces répertoires sont précédés de chemins relatifs définis dans les sections suivantes de manière à produire un chemin absolu et complet\&. .PP ArchiveDir -.RS 3n -Indique la racine de l'archive FTP\ ; Pour une configuration Debian classique, c'est le répertoire qui contient le fichier +.RS 4 +Indique la racine de l\'archive FTP\ \&; Pour une configuration Debian classique, c\'est le répertoire qui contient le fichier \fIls\-LR\fR -et les noeuds des distributions. +et les noeuds des distributions\&. .RE .PP OverrideDir -.RS 3n -Indique l'emplacement des fichiers d'\(Fo\ override\ \(Fc. +.RS 4 +Indique l\'emplacement des fichiers d\'\(Fo\ \&override\ \&\(Fc\&. .RE .PP CacheDir -.RS 3n -Indique l'emplacement des fichiers de cache. +.RS 4 +Indique l\'emplacement des fichiers de cache\&. .RE .PP FileListDir -.RS 3n -Indique l'emplacement des fichiers contenant la liste des fichiers (si on se sert de la valeur +.RS 4 +Indique l\'emplacement des fichiers contenant la liste des fichiers (si on se sert de la valeur FileList -définie plus bas). +définie plus bas)\&. .RE .SS "La section Default" .PP La section Default -précise les valeurs par défaut et les paramètres qui contrôlent la marche du générateur. Ces valeurs peuvent être annulées dans d'autres sections (paramètrage par section). +précise les valeurs par défaut et les paramètres qui contrôlent la marche du générateur\&. Ces valeurs peuvent être annulées dans d\'autres sections (paramètrage par section)\&. .PP Packages::Compress -.RS 3n -Indique comment sont compressés les fichiers d'index. C'est une chaîne qui contient des valeurs séparées par des espaces\ ; elle contient au moins l'une des valeurs suivantes\ : \(Fo\ .\ \(Fc (pas de compression), \(Fo\ gzip\ \(Fc, \(Fo\ bzip2\ \(Fc. Par défaut, c'est la chaîne \(Fo\ . gzip\ \(Fc. +.RS 4 +Indique comment sont compressés les fichiers d\'index\&. C\'est une chaîne qui contient des valeurs séparées par des espaces\ \&; elle contient au moins l\'une des valeurs suivantes\ \&: \(Fo\ \&\&.\ \&\(Fc (pas de compression), \(Fo\ \&gzip\ \&\(Fc, \(Fo\ \&bzip2\ \&\(Fc\&. Par défaut, c\'est la chaîne \(Fo\ \&\&. gzip\ \&\(Fc\&. .RE .PP Packages::Extensions -.RS 3n -Indique la liste par défaut des extensions de fichier qui constituent des paquets. Par défaut, c'est \(Fo\ .deb\ \(Fc. +.RS 4 +Indique la liste par défaut des extensions de fichier qui constituent des paquets\&. Par défaut, c\'est \(Fo\ \&\&.deb\ \&\(Fc\&. .RE .PP Sources::Compress -.RS 3n +.RS 4 Identique à Packages::Compress -mais précise comment sont compressés les fichiers sources. +mais précise comment sont compressés les fichiers sources\&. .RE .PP Sources::Extensions -.RS 3n -Indique la liste par défaut des extensions de fichier qui constituent des fichiers sources. Par défaut, c'est \(Fo\ .dsc\ \(Fc. +.RS 4 +Indique la liste par défaut des extensions de fichier qui constituent des fichiers sources\&. Par défaut, c\'est \(Fo\ \&\&.dsc\ \&\(Fc\&. .RE .PP Contents::Compress -.RS 3n +.RS 4 Identique à Packages::Compress -mais précise comment sont compressés les fichiers \(Fo\ Contents\ \(Fc. +mais précise comment sont compressés les fichiers \(Fo\ \&Contents\ \&\(Fc\&. .RE .PP DeLinkLimit -.RS 3n -Indique le nombre de kilooctets à délier (et à remplacer par des liens en dur) pour chaque exécution. On s'en sert, pour chaque section, avec le paramètre -External\-Links. +.RS 4 +Indique le nombre de kilooctets à délier (et à remplacer par des liens en dur) pour chaque exécution\&. On s\'en sert, pour chaque section, avec le paramètre +External\-Links\&. .RE .PP FileMode -.RS 3n -Indique le système de permissions des fichiers d'index créés. Par défaut, c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque utilisateur (umasq) est ignoré. +.RS 4 +Indique le système de permissions des fichiers d\'index créés\&. Par défaut, c\'est le mode 0644\&. Tous les fichiers d\'index ont ce mode et le masque utilisateur (umasq) est ignoré\&. .RE .SS "La section TreeDefault" .PP On indique les valeurs par défaut particulières à la section -Tree. Toutes ces variables sont des variables de substitution\ ; les chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur respective. +Tree\&. Toutes ces variables sont des variables de substitution\ \&; les chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur respective\&. .PP MaxContentsChange -.RS 3n -Indique le nombre de kilooctets de fichiers \(Fo\ Contents\ \(Fc qui sont créés chaque jour. Les fichiers \(Fo\ Contents\ \(Fc sont tirés au sort selon le système +.RS 4 +Indique le nombre de kilooctets de fichiers \(Fo\ \&Contents\ \&\(Fc qui sont créés chaque jour\&. Les fichiers \(Fo\ \&Contents\ \&\(Fc sont tirés au sort selon le système \fIround\-robin\fR -de manière que, sur plusieurs jours, tous soient reconstruits. +de manière que, sur plusieurs jours, tous soient reconstruits\&. .RE .PP ContentsAge -.RS 3n -Contrôle le nombre de jours pendant lequel un fichier \(Fo\ Contents\ \(Fc peut être utilisé sans actualisation. Quand cette limite est franchie, le \(Fo\ mtime\ \(Fc du fichier \(Fo\ Contents\ \(Fc est mis à jour. Cela peut arriver quand un fichier est modifié sans que cela modifie le fichier \(Fo\ Contents\ \(Fc (modification par \(Fo\ override\ \(Fc par exemple). Un délai est permis dans l'espoir que de nouveaux \(Fo\ .deb\ \(Fc seront installés, exigeant un nouveau \(Fo\ Contents\ \(Fc. Par défaut ce nombre vaut 10, l'unité étant le jour. +.RS 4 +Contrôle le nombre de jours pendant lequel un fichier \(Fo\ \&Contents\ \&\(Fc peut être utilisé sans actualisation\&. Quand cette limite est franchie, le \(Fo\ \&mtime\ \&\(Fc du fichier \(Fo\ \&Contents\ \&\(Fc est mis à jour\&. Cela peut arriver quand un fichier est modifié sans que cela modifie le fichier \(Fo\ \&Contents\ \&\(Fc (modification par \(Fo\ \&override\ \&\(Fc par exemple)\&. Un délai est permis dans l\'espoir que de nouveaux \(Fo\ \&\&.deb\ \&\(Fc seront installés, exigeant un nouveau \(Fo\ \&Contents\ \&\(Fc\&. Par défaut ce nombre vaut 10, l\'unité étant le jour\&. .RE .PP Directory -.RS 3n -Indique la racine de l'arborescence des \(Fo\ .deb\ \(Fc. Par défaut, c'est -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR. +.RS 4 +Indique la racine de l\'arborescence des \(Fo\ \&\&.deb\ \&\(Fc\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR\&. .RE .PP SrcDirectory -.RS 3n -Indique la racine de l'arborescence des paquets source. Par défaut, c'est -\fI$(DIST)/$(SECTION)/source/\fR. +.RS 4 +Indique la racine de l\'arborescence des paquets source\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/source/\fR\&. .RE .PP Packages -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc créé. Par défaut, c'est -\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc créé\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR\&. .RE .PP Sources -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc crée. Par défaut, c'est -\fI$(DIST)/$(SECTION)/source/Sources\fR. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc crée\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/source/Sources\fR\&. .RE .PP InternalPrefix -.RS 3n -Indique un préfixe de chemin\ ; ce préfixe fait qu'un lien symbolique sera considéré comme un lien interne plutôt que comme un lien externe. Par défaut, c'est -\fI$(DIST)/$(SECTION)/\fR. +.RS 4 +Indique un préfixe de chemin\ \&; ce préfixe fait qu\'un lien symbolique sera considéré comme un lien interne plutôt que comme un lien externe\&. Par défaut, c\'est +\fI$(DIST)/$(SECTION)/\fR\&. .RE .PP Contents -.RS 3n -Indique le fichier \(Fo\ Contents\ \(Fc créé. Par défaut, c'est -\fI$(DIST)/Contents\-$(ARCH)\fR. Quand le paramètrage fait que différents fichiers \(Fo\ Packages\ \(Fc se réfèrent à un seul fichier \(Fo\ Contents\ \(Fc, +.RS 4 +Indique le fichier \(Fo\ \&Contents\ \&\(Fc créé\&. Par défaut, c\'est +\fI$(DIST)/Contents\-$(ARCH)\fR\&. Quand le paramètrage fait que différents fichiers \(Fo\ \&Packages\ \&\(Fc se réfèrent à un seul fichier \(Fo\ \&Contents\ \&\(Fc, \fBapt\-ftparchive\fR -les intègre automatiquement. +les intègre automatiquement\&. .RE .PP Contents::Header -.RS 3n -Indique l'en\-tête à préfixer au fichier \(Fo\ Contents\ \(Fc créé. +.RS 4 +Indique l\'en\-tête à préfixer au fichier \(Fo\ \&Contents\ \&\(Fc créé\&. .RE .PP BinCacheDB -.RS 3n -Indique la base de données binaire servant de cache pour cette section. Différentes sections peuvent partager cette base de données. +.RS 4 +Indique la base de données binaire servant de cache pour cette section\&. Différentes sections peuvent partager cette base de données\&. .RE .PP FileList -.RS 3n -Indique qu'au lieu de lire l'arborescence, +.RS 4 +Indique qu\'au lieu de lire l\'arborescence, \fBapt\-ftparchive\fR -doit lire la liste de fichiers dans le fichier donné en argument. Les noms relatifs sont préfixés par le répertoire de l'archive. +doit lire la liste de fichiers dans le fichier donné en argument\&. Les noms relatifs sont préfixés par le répertoire de l\'archive\&. .RE .PP SourceFileList -.RS 3n -Indique qu'au lieu de lire l'arborescence, +.RS 4 +Indique qu\'au lieu de lire l\'arborescence, \fBapt\-ftparchive\fR -doit lire la liste de fichiers dans le fichier donné en argument. Les noms relatifs sont préfixés par le répertoire de l'archive. On s'en sert pour traiter les index de sources. +doit lire la liste de fichiers dans le fichier donné en argument\&. Les noms relatifs sont préfixés par le répertoire de l\'archive\&. On s\'en sert pour traiter les index de sources\&. .RE .SS "La section Tree" .PP La section Tree -définit une arborescence debian classique avec un répertoire de base, différentes sections dans ce répertoire et différentes architectures dans chaque section. Le chemin exact est défini par la variable de substitution -Directory. +définit une arborescence debian classique avec un répertoire de base, différentes sections dans ce répertoire et différentes architectures dans chaque section\&. Le chemin exact est défini par la variable de substitution +Directory\&. .PP La section Tree accepte une étiquette de visée (scope tag) qui détermine la variable $(DIST) -et la racine de l'arborescence (le chemin est préfixé par -ArchiveDir). C'est par exemple\ : -\fIdists/woody\fR. +et la racine de l\'arborescence (le chemin est préfixé par +ArchiveDir)\&. C\'est par exemple\ \&: +\fIdists/woody\fR\&. .PP Tous les paramètres définis dans la section TreeDefault -peuvent s'utiliser dans la section +peuvent s\'utiliser dans la section Tree -ainsi que les trois nouvelles variables suivantes. +ainsi que les trois nouvelles variables suivantes\&. .PP Quand il exécute la section Tree, \fBapt\-ftparchive\fR -agit ainsi\ : -.sp .RS 3n .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE +agit ainsi\ \&: +.sp .RS 4 .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE .PP Sections -.RS 3n -C'est une liste de sections séparées par des espaces qui appartiennent à une distribution\ ; classiquement, on trouve -main contrib non\-free. +.RS 4 +C\'est une liste de sections séparées par des espaces qui appartiennent à une distribution\ \&; classiquement, on trouve +main contrib non\-free\&. .RE .PP Architectures -.RS 3n -C'est une liste de toutes les architectures qui appartiennent à chaque section. L'architecture spéciale \(Fo\ source\ \(Fc indique que l'arborescence est une arborescence de sources. +.RS 4 +C\'est une liste de toutes les architectures qui appartiennent à chaque section\&. L\'architecture spéciale \(Fo\ \&source\ \&\(Fc indique que l\'arborescence est une arborescence de sources\&. .RE .PP BinOverride -.RS 3n -Indique le fichier binaire d'\(Fo\ override\ \(Fc. Ce fichier contient des informations sur la section, la priorité et le responsable du paquet. +.RS 4 +Indique le fichier binaire d\'\(Fo\ \&override\ \&\(Fc\&. Ce fichier contient des informations sur la section, la priorité et le responsable du paquet\&. .RE .PP SrcOverride -.RS 3n -Indique le fichier source d'\(Fo\ override\ \(Fc. Ce fichier contient des informations sur la section. +.RS 4 +Indique le fichier source d\'\(Fo\ \&override\ \&\(Fc\&. Ce fichier contient des informations sur la section\&. .RE .PP ExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .SS "La section BinDirectory" .PP La section bindirectory -définit une arborescence binaire sans structure particulière. L'étiquette de visée (scope tag) indique l'emplacement du répertoire binaire et le paramètrage est identique à celui pour la section +définit une arborescence binaire sans structure particulière\&. L\'étiquette de visée (scope tag) indique l\'emplacement du répertoire binaire et le paramètrage est identique à celui pour la section Tree sans substitution de variables ou au paramètrage de -SectionArchitecture. +SectionArchitecture\&. .PP Packages -.RS 3n -Indique le fichier \(Fo\ Packages\ \(Fc créé. +.RS 4 +Indique le fichier \(Fo\ \&Packages\ \&\(Fc créé\&. .RE .PP Sources -.RS 3n -Indique le fichier \(Fo\ Sources\ \(Fc créé. L'un des deux fichiers, +.RS 4 +Indique le fichier \(Fo\ \&Sources\ \&\(Fc créé\&. L\'un des deux fichiers, Packages ou Sources -est nécessaire. +est nécessaire\&. .RE .PP Contents -.RS 3n -Indique le fichier \(Fo\ Contents\ \(Fc créé. +.RS 4 +Indique le fichier \(Fo\ \&Contents\ \&\(Fc créé\&. .RE .PP Binoverride -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcOverride -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .PP ExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les binaires. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les binaires\&. .RE .PP SrcExtraOverride -.RS 3n -Indique un autre fichier d'\(Fo\ override\ \(Fc pour les sources. +.RS 4 +Indique un autre fichier d\'\(Fo\ \&override\ \&\(Fc pour les sources\&. .RE .PP BinCacheDB -.RS 3n -Indique une base de données cache. +.RS 4 +Indique une base de données cache\&. .RE .PP PathPrefix -.RS 3n -Ajoute un chemin à tous les chemins créés. +.RS 4 +Ajoute un chemin à tous les chemins créés\&. .RE .PP FileList, SourceFileList -.RS 3n -Indique le fichier contenant la liste des fichiers. +.RS 4 +Indique le fichier contenant la liste des fichiers\&. .RE -.SH "LE FICHIER D'\(Fo\ OVERRIDE\ \(Fc POUR LES BINAIRES." +.SH "LE FICHIER D'\(Fo\ \&OVERRIDE\ \&\(Fc POUR LES BINAIRES." .PP -Le fichier d'\(Fo\ Override\ \(Fc est pleinement compatible avec -\fBdpkg\-scanpackages\fR(8). Il contient quatre champs séparés par des espaces. Le premier est le nom du paquet\ ; le deuxième est la priorité à donner à ce paquet\ ; le troisième est sa section et le dernier champ est un champ pour changer le nom du responsable de paquet. +Le fichier d\'\(Fo\ \&Override\ \&\(Fc est pleinement compatible avec +\fBdpkg-scanpackages\fR(8)\&. Il contient quatre champs séparés par des espaces\&. Le premier est le nom du paquet\ \&; le deuxième est la priorité à donner à ce paquet\ \&; le troisième est sa section et le dernier champ est un champ pour changer le nom du responsable de paquet\&. .PP -Le champ du responsable est de cette forme\ : +Le champ du responsable est de cette forme\ \&: .sp -.RS 3n +.RS 4 .nf old [// oldn]* => new .fi @@ -403,96 +403,96 @@ old [// oldn]* => new .sp ou simplement, .sp -.RS 3n +.RS 4 .nf new .fi .RE .sp -La première forme permet de spécifier de vieilles adresses dans une liste (le séparateur est la double barre oblique). Si l'une de ces deux formes est rencontrée, la valeur de new remplace la valeur du champ. La deuxième forme remplace inconditionnellement le champ. -.SH "LE FICHIER D'\(Fo\ OVERRIDE\ \(Fc POUR LES SOURCES" +La première forme permet de spécifier de vieilles adresses dans une liste (le séparateur est la double barre oblique)\&. Si l\'une de ces deux formes est rencontrée, la valeur de new remplace la valeur du champ\&. La deuxième forme remplace inconditionnellement le champ\&. +.SH "LE FICHIER D'\(Fo\ \&OVERRIDE\ \&\(Fc POUR LES SOURCES" .PP -Le fichier d'\(Fo\ Override\ \(Fc est pleinement compatible avec -\fBdpkg\-scansources\fR(8). Il contient deux champs. Le premier est le nom du paquet source\ ; le second, sa section. -.SH "LE FICHIER SUPPLÉMENTAIRE D'\(Fo\ OVERRIDE\ \(Fc" +Le fichier d\'\(Fo\ \&Override\ \&\(Fc est pleinement compatible avec +\fBdpkg-scansources\fR(8)\&. Il contient deux champs\&. Le premier est le nom du paquet source\ \&; le second, sa section\&. +.SH "LE FICHIER SUPPLÉMENTAIRE D'\(Fo\ \&OVERRIDE\ \&\(Fc" .PP -Le fichier supplémentaire d'\(Fo\ Override\ \(Fc permet d'ajouter ou de remplacer des étiquettes sur la sortie. Il possède trois colonnes\ : la première représente le paquet, la seconde est une étiquette et la troisième en fin de ligne est la nouvelle valeur. +Le fichier supplémentaire d\'\(Fo\ \&Override\ \&\(Fc permet d\'ajouter ou de remplacer des étiquettes sur la sortie\&. Il possède trois colonnes\ \&: la première représente le paquet, la seconde est une étiquette et la troisième en fin de ligne est la nouvelle valeur\&. .SH "LES OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-\-md5\fR -.RS 3n -Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où c'est possible. Élément de configuration\ : -APT::FTPArchive::MD5. +.RS 4 +Créer la somme de contrôle MD5\&. Cette option est activée par défaut\&. Quand elle est désactivée, les fichiers d\'index n\'ont pas les champs MD5Sum là où c\'est possible\&. Élément de configuration\ \&: +APT::FTPArchive::MD5\&. .RE .PP \fB\-d\fR, \fB\-\-db\fR -.RS 3n -Utiliser une base de données binaire pour cache. Cela n'a aucun effet sur la commande generate. Élément de configuration\ : -APT::FTPArchive::DB. +.RS 4 +Utiliser une base de données binaire pour cache\&. Cela n\'a aucun effet sur la commande generate\&. Élément de configuration\ \&: +APT::FTPArchive::DB\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; cette commande produit une sortie destinée à l'enregistrement dans un fichier\-journal en omettant les indicateurs de progression. Un plus grand nombre de \(Fo\ q\ \(Fc (2 au plus) produit un plus grand silence. On peut aussi utiliser +.RS 4 +Mode silencieux\ \&; cette commande produit une sortie destinée à l\'enregistrement dans un fichier\-journal en omettant les indicateurs de progression\&. Un plus grand nombre de \(Fo\ \&q\ \&\(Fc (2 au plus) produit un plus grand silence\&. On peut aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, et annuler le fichier de configuration. Élément de configuration\ : -quiet. +pour positionner le niveau de silence, et annuler le fichier de configuration\&. Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-\-delink\fR -.RS 3n -Faire une déliaison. Si +.RS 4 +Faire une déliaison\&. Si External\-Links -est activé, cette option permet réellement la déliaison des fichiers. Par défaut, elle est activée mais elle peut être désactivée avec l'option -\fB\-\-no\-delink\fR. Élément de configuration\ : -APT::FTPArchive::DeLinkAct. +est activé, cette option permet réellement la déliaison des fichiers\&. Par défaut, elle est activée mais elle peut être désactivée avec l\'option +\fB\-\-no\-delink\fR\&. Élément de configuration\ \&: +APT::FTPArchive::DeLinkAct\&. .RE .PP \fB\-\-contents\fR -.RS 3n -Permettre la création d'un fichier \(Fo\ Contents\ \(Fc. Quand cette option est activée et que les index sont créés sous forme de base de données binaire, la liste des fichiers est aussi extraite et conservée dans la base de données pour un usage futur. Avec la commande generate, cette option permet la création de fichiers \(Fo\ Contents\ \(Fc. Par défaut, elle est activée. Élément de configuration\ : -APT::FTPArchive::Contents. +.RS 4 +Permettre la création d\'un fichier \(Fo\ \&Contents\ \&\(Fc\&. Quand cette option est activée et que les index sont créés sous forme de base de données binaire, la liste des fichiers est aussi extraite et conservée dans la base de données pour un usage futur\&. Avec la commande generate, cette option permet la création de fichiers \(Fo\ \&Contents\ \&\(Fc\&. Par défaut, elle est activée\&. Élément de configuration\ \&: +APT::FTPArchive::Contents\&. .RE .PP \fB\-s\fR, \fB\-\-source\-override\fR -.RS 3n -Indique le fichier d'\(Fo\ override\ \(Fc à utiliser avec la commande -sources. Élément de configuration\ : -APT::FTPArchive::SourceOverride. +.RS 4 +Indique le fichier d\'\(Fo\ \&override\ \&\(Fc à utiliser avec la commande +sources\&. Élément de configuration\ \&: +APT::FTPArchive::SourceOverride\&. .RE .PP \fB\-\-readonly\fR -.RS 3n -N'autoriser que la lecture pour les bases de données de cache. Élément de configuration\ : -APT::FTPArchive::ReadOnlyDB. +.RS 4 +N\'autoriser que la lecture pour les bases de données de cache\&. Élément de configuration\ \&: +APT::FTPArchive::ReadOnlyDB\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -501,30 +501,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .PP \fBapt\-ftparchive\fR -retourne zéro si tout se passe bien, le nombre décimal 100 en cas d'erreur. +retourne zéro si tout se passe bien, le nombre décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-get.8 b/doc/fr/apt-get.8 index b92669d..013d4d0 100644 --- a/doc/fr/apt-get.8 +++ b/doc/fr/apt-get.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-get +.\" Title: apt-get .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-get \- Utilitaire d'APT pour la manipulation de paquets \-\- interface en ligne de commande. +apt-get \- Utilitaire d'APT pour la manipulation de paquets -- interface en ligne de commande. .SH "SYNOPSIS" .HP 8 \fBapt\-get\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[update] | [upgrade] | [dselect\-upgrade] | [install\ \fIpaquet\fR...] | [remove\ \fIpaquet\fR...] | [source\ \fIpaquet\fR...] | [build\-dep\ \fIpaquet\fR...] | [check] | [clean] | [autoclean]} @@ -19,473 +19,475 @@ apt\-get \- Utilitaire d'APT pour la manipulation de paquets \-\- interface en l .PP \fBApt\-get\fR -est l'outil en ligne de commande pour manipuler les paquets. Il peut être considéré par l'utilisateur comme un générateur de sortie pour les autres outils de la bibliothèque APT. Plusieurs interfaces utilisateur existent, comme dselect, aptitude, synaptic, gnome\-apt ou wajig. +est l\'outil en ligne de commande pour manipuler les paquets\&. Il peut être considéré par l\'utilisateur comme un générateur de sortie pour les autres outils de la bibliothèque APT\&. Plusieurs interfaces utilisateur existent, comme dselect, aptitude, synaptic, gnome\-apt ou wajig\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR, ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP update -.RS 3n +.RS 4 La commande update -permet de resynchroniser un fichier répertoriant les paquets disponibles et sa source. Ces fichiers sont récupérés aux endroits spécifiés dans -\fI/etc/apt/sources.list\fR. Ainsi, lorsqu'on utilise une archive Debian, cette commande récupère les fichiers -\fIPackages.gz\fR -et les analyse de manière à rendre disponibles les informations concernant les nouveaux paquets et les paquets mis à jour. On doit toujours exécuter une commande +permet de resynchroniser un fichier répertoriant les paquets disponibles et sa source\&. Ces fichiers sont récupérés aux endroits spécifiés dans +\fI/etc/apt/sources\&.list\fR\&. Ainsi, lorsqu\'on utilise une archive Debian, cette commande récupère les fichiers +\fIPackages\&.gz\fR +et les analyse de manière à rendre disponibles les informations concernant les nouveaux paquets et les paquets mis à jour\&. On doit toujours exécuter une commande update avant les commandes upgrade ou -dist\-upgrade. Il faut savoir que l'indicateur de progression d'ensemble n'est pas correct puisque la taille de ces fichiers ne peut être connue à l'avance. +dist\-upgrade\&. Il faut savoir que l\'indicateur de progression d\'ensemble n\'est pas correct puisque la taille de ces fichiers ne peut être connue à l\'avance\&. .RE .PP upgrade -.RS 3n +.RS 4 La commande upgrade -permet d'installer les versions les plus récentes de tous les paquets présents sur le système en utilisant les sources énumérées dans -\fI/etc/apt/sources.list\fR. Les paquets installés dont il existe de nouvelles versions sont récupérés et mis à niveau. En aucun cas des paquets déjà installés ne sont supprimés\ ; de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni installés. Les paquets dont de nouvelles versions ne peuvent pas être installées sans changer le statut d'installation d'un autre paquet sont laissés dans leur version courante. On doit d'abord exécuter la commande +permet d\'installer les versions les plus récentes de tous les paquets présents sur le système en utilisant les sources énumérées dans +\fI/etc/apt/sources\&.list\fR\&. Les paquets installés dont il existe de nouvelles versions sont récupérés et mis à niveau\&. En aucun cas des paquets déjà installés ne sont supprimés\ \&; de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni installés\&. Les paquets dont de nouvelles versions ne peuvent pas être installées sans changer le statut d\'installation d\'un autre paquet sont laissés dans leur version courante\&. On doit d\'abord exécuter la commande update pour que \fBapt\-get\fR -connaisse l'existence de nouvelles versions des paquets. +connaisse l\'existence de nouvelles versions des paquets\&. .RE .PP dselect\-upgrade -.RS 3n +.RS 4 dselect\-upgrade est utilisée conjointement avec -\fBdselect\fR(8), l'interface traditionnelle Debian pour la gestion des paquets. La commande +\fBdselect\fR(8), l\'interface traditionnelle Debian pour la gestion des paquets\&. La commande dselect\-upgrade suit les modifications faites par \fBdselect\fR(8) dans le champ Status -des paquets disponibles, et effectue les actions nécessaires à la réalisation de cet état (par exemple, suppression d'anciens paquets, installation de nouveaux paquets). +des paquets disponibles, et effectue les actions nécessaires à la réalisation de cet état (par exemple, suppression d\'anciens paquets, installation de nouveaux paquets)\&. .RE .PP dist\-upgrade -.RS 3n +.RS 4 La commande dist\-upgrade effectue la fonction upgrade -en y ajoutant une gestion intelligente des changements de dépendances dans les nouvelles versions des paquets\ ; +en y ajoutant une gestion intelligente des changements de dépendances dans les nouvelles versions des paquets\ \&; \fBapt\-get\fR -possède un système \(Fo\ intelligent\ \(Fc de résolution des conflits et il essaye, quand c'est nécessaire, de mettre à niveau les paquets les plus importants aux dépens des paquets les moins importants. Le fichier -\fI/etc/apt/sources.list\fR -contient une liste de sources où récupérer les paquets désirés. Voyez aussi +possède un système \(Fo\ \&intelligent\ \&\(Fc de résolution des conflits et il essaye, quand c\'est nécessaire, de mettre à niveau les paquets les plus importants aux dépens des paquets les moins importants\&. Le fichier +\fI/etc/apt/sources\&.list\fR +contient une liste de sources où récupérer les paquets désirés\&. Voyez aussi \fBapt_preferences\fR(5) -pour un mécanisme de remplacement des paramètres généraux pour certains paquets. +pour un mécanisme de remplacement des paramètres généraux pour certains paquets\&. .RE .PP install -.RS 3n +.RS 4 La commande install -est suivie par un ou plusieurs paquets à installer. Chaque paquet est un nom de paquet\ ; ce n'est pas un nom de fichier entièrement défini (par exemple, dans un système Debian GNU/Linux, on indiquera libc6 et non pas -libc6_1.9.6\-2.deb). Tous les paquets requis par le(s) paquet(s) que l'on veut installer sont aussi récupérés et installés. On se sert du fichier -\fI/etc/apt/sources.list\fR -pour localiser les paquets désirés. Quand un trait d'union est accolé (sans espace intermédiaire) au nom d'un paquet déjà installé, ce paquet est supprimé. De même on peut ajouter un signe \(Fo\ +\ \(Fc pour désigner un paquet à installer. Cette dernière fonctionnalité peut être utilisée pour annuler les décisions prises par le système de résolution des conflits d'apt\-get. +est suivie par un ou plusieurs paquets à installer\&. Chaque paquet est un nom de paquet\ \&; ce n\'est pas un nom de fichier entièrement défini (par exemple, dans un système Debian GNU/Linux, on indiquera libc6 et non pas +libc6_1\&.9\&.6\-2\&.deb)\&. Tous les paquets requis par le(s) paquet(s) que l\'on veut installer sont aussi récupérés et installés\&. On se sert du fichier +\fI/etc/apt/sources\&.list\fR +pour localiser les paquets désirés\&. Quand un trait d\'union est accolé (sans espace intermédiaire) au nom d\'un paquet déjà installé, ce paquet est supprimé\&. De même on peut ajouter un signe \(Fo\ \&+\ \&\(Fc pour désigner un paquet à installer\&. Cette dernière fonctionnalité peut être utilisée pour annuler les décisions prises par le système de résolution des conflits d\'apt\-get\&. .sp -On peut choisir d'installer une version particulière d'un paquet en faisant suivre son nom par un signe égal et par la version. Cette version sera localisée et l'installation sera demandée. On peut aussi choisir une distribution particulière en faisant suivre le nom du paquet par une barre oblique et par le nom de la distribution ou de l'archive (stable, testing, unstable). +On peut choisir d\'installer une version particulière d\'un paquet en faisant suivre son nom par un signe égal et par la version\&. Cette version sera localisée et l\'installation sera demandée\&. On peut aussi choisir une distribution particulière en faisant suivre le nom du paquet par une barre oblique et par le nom de la distribution ou de l\'archive (stable, testing, unstable)\&. .sp -Avec ces possibilités de choisir la version, de vieilles versions d'un paquet peuvent être installées. Il faut faire attention. +Avec ces possibilités de choisir la version, de vieilles versions d\'un paquet peuvent être installées\&. Il faut faire attention\&. .sp -Enfin, le mécanisme d'\fBapt_preferences\fR(5) -permet de créer d'autres règles pour l'installation des paquets. +Enfin, le mécanisme d\'\fBapt_preferences\fR(5) +permet de créer d\'autres règles pour l\'installation des paquets\&. .sp -Quand aucun paquet ne correspond à l'expression donnée en argument et que cette expression contient l'un des caractères \(Fo\ .\ \(Fc, \(Fo\ ?\ \(Fc ou \(Fo\ *\ \(Fc, on considère que c'est une expression rationnelle POSIX et elle est appliquée à tous les paquets de la base de données. Tout paquet correspondant est installé (ou supprimé). Notez que la comparaison est effectuée par sous\-chaîne et \(Fo\ lo\ \(Fc correspond aussi bien à \(Fo\ how\-lo\ \(Fc qu'à \(Fo\ lowest\ \(Fc. Si vous ne le voulez pas, ancrez l'expression par un caractère \(Fo\ ^\ \(Fc ou un caractère \(Fo\ $\ \(Fc, ou bien créez une expression plus précise. +Quand aucun paquet ne correspond à l\'expression donnée en argument et que cette expression contient l\'un des caractères \(Fo\ \&\&.\ \&\(Fc, \(Fo\ \&?\ \&\(Fc ou \(Fo\ \&*\ \&\(Fc, on considère que c\'est une expression rationnelle POSIX et elle est appliquée à tous les paquets de la base de données\&. Tout paquet correspondant est installé (ou supprimé)\&. Notez que la comparaison est effectuée par sous\-chaîne et \(Fo\ \&lo\ \&\(Fc correspond aussi bien à \(Fo\ \&how\-lo\ \&\(Fc qu\'à \(Fo\ \&lowest\ \&\(Fc\&. Si vous ne le voulez pas, ancrez l\'expression par un caractère \(Fo\ \&^\ \&\(Fc ou un caractère \(Fo\ \&$\ \&\(Fc, ou bien créez une expression plus précise\&. .RE .PP remove -.RS 3n +.RS 4 La commande remove est identique à la commande -install\ ; Mais les paquets sont supprimés et non pas installés. Quand un signe plus est accolé (sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu d'être supprimé. +install\ \&; Mais les paquets sont supprimés et non pas installés\&. Quand un signe plus est accolé (sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu d\'être supprimé\&. .RE .PP source -.RS 3n +.RS 4 Avec la commande source, \fBapt\-get\fR -récupère des paquets sources. APT examine les paquets disponibles pour choisir le paquet source à récupérer. Il trouve ensuite et télécharge dans le répertoire courant la version la plus récente. Les paquets source sont gérés indépendamment des paquets binaires, via les lignes de type +récupère des paquets sources\&. APT examine les paquets disponibles pour choisir le paquet source à récupérer\&. Il trouve ensuite et télécharge dans le répertoire courant la version la plus récente\&. Les paquets source sont gérés indépendamment des paquets binaires, via les lignes de type deb\-src dans le fichier -\fBsources.list\fR(5). On n'obtiendra probablement pas les mêmes sources que celles du paquet installé ou celles du paquet qu'on pourrait installer. Si l'option +\fBsources.list\fR(5)\&. On n\'obtiendra probablement pas les mêmes sources que celles du paquet installé ou celles du paquet qu\'on pourrait installer\&. Si l\'option \fB\-\-compile\fR -est spécifiée, le paquet est compilé en un binaire .deb avec -\fBdpkg\-buildpackage\fR. Si +est spécifiée, le paquet est compilé en un binaire \&.deb avec +\fBdpkg\-buildpackage\fR\&. Si \fB\-\-download\-only\fR -est spécifié, le source n'est pas décompacté. +est spécifié, le source n\'est pas décompacté\&. .sp -De la même façon qu'avec les paquets binaires, on peut récupérer une version particulière d'un paquet source en faisant suivre son nom par un signe égal et par la version. Cela permet une comparaison exacte entre le nom du paquet source et la version\ ; cela lance implicitement la commande -APT::Get::Only\-Source. +De la même façon qu\'avec les paquets binaires, on peut récupérer une version particulière d\'un paquet source en faisant suivre son nom par un signe égal et par la version\&. Cela permet une comparaison exacte entre le nom du paquet source et la version\ \&; cela lance implicitement la commande +APT::Get::Only\-Source\&. .sp -Notez que les paquets sources ne sont pas suivis comme le sont les paquets binaires. Ils ne sont présents que dans le répertoire courant et sont semblables à des sources téléchargés sous forme de tarball. +Notez que les paquets sources ne sont pas suivis comme le sont les paquets binaires\&. Ils ne sont présents que dans le répertoire courant et sont semblables à des sources téléchargés sous forme de tarball\&. .RE .PP build\-dep -.RS 3n +.RS 4 Avec la commande -build\-dep, apt\-get installe ou supprime des paquets dans le but de satisfaire les dépendances de construction d'un paquet source. Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au hasard. +build\-dep, apt\-get installe ou supprime des paquets dans le but de satisfaire les dépendances de construction d\'un paquet source\&. Pour l\'instant, dans la cas d\'un paquet virtuel, un paquet est choisi au hasard\&. .RE .PP check -.RS 3n +.RS 4 La commande check -est un outil de diagnostic\ ; il met à jour le cache des paquets et cherche des dépendances défectueuses. +est un outil de diagnostic\ \&; il met à jour le cache des paquets et cherche des dépendances défectueuses\&. .RE .PP clean -.RS 3n +.RS 4 La commande clean -nettoie le référentiel local des paquets récupérés. Il supprime tout, excepté le fichier lock situé dans +nettoie le référentiel local des paquets récupérés\&. Il supprime tout, excepté le fichier lock situé dans \fI/var/cache/apt/archives/\fR et -\fI/var/cache/apt/archives/partial/\fR. Quand APT est utilisé comme mode de +\fI/var/cache/apt/archives/partial/\fR\&. Quand APT est utilisé comme mode de \fBdselect\fR(8), clean -est effectué automatiquement. Quand on n'utilise pas dselect, il faut exécuter +est effectué automatiquement\&. Quand on n\'utilise pas dselect, il faut exécuter apt\-get clean -de temps en temps si l'on veut libérer de l'espace disque. +de temps en temps si l\'on veut libérer de l\'espace disque\&. .RE .PP autoclean -.RS 3n +.RS 4 Tout comme clean, autoclean -nettoie le référentiel local des paquets récupérés. La différence est qu'il supprime uniquement les paquets qui ne peuvent plus être téléchargés et qui sont grandement inutiles. On peut ainsi contrôler la taille de ce cache sur une longue période. Tant qu'elle n'est pas activée, l'option de configuration +nettoie le référentiel local des paquets récupérés\&. La différence est qu\'il supprime uniquement les paquets qui ne peuvent plus être téléchargés et qui sont grandement inutiles\&. On peut ainsi contrôler la taille de ce cache sur une longue période\&. Tant qu\'elle n\'est pas activée, l\'option de configuration APT::Clean\-Installed -empêche la suppression de paquets installés. +empêche la suppression de paquets installés\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-d\fR, \fB\-\-download\-only\fR -.RS 3n -Récupération seule\ ; les paquets sont récupérés mais ne sont ni dépaquetés ni installés. Élément de configuration\ : -APT::Get::Download\-Only. +.RS 4 +Récupération seule\ \&; les paquets sont récupérés mais ne sont ni dépaquetés ni installés\&. Élément de configuration\ \&: +APT::Get::Download\-Only\&. .RE .PP \fB\-f\fR, \fB\-\-fix\-broken\fR -.RS 3n -Correction\ ; essaye de réparer un système dont les dépendances sont défectueuses. Cette option, utilisée avec install ou remove, peut omettre tout paquet de façon à permettre à APT de déduire une solution viable. Chaque paquet spécifié doit complètement corriger le problème. Cette option est quelquefois nécessaire lorsque l'on exécute APT pour la première fois\ ; APT lui\-même interdit les dépendances défectueuses dans un système. Il est possible que la structure de dépendances d'un système soit tellement corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la plupart du temps utiliser +.RS 4 +Correction\ \&; essaye de réparer un système dont les dépendances sont défectueuses\&. Cette option, utilisée avec install ou remove, peut omettre tout paquet de façon à permettre à APT de déduire une solution viable\&. Chaque paquet spécifié doit complètement corriger le problème\&. Cette option est quelquefois nécessaire lorsque l\'on exécute APT pour la première fois\ \&; APT lui\-même interdit les dépendances défectueuses dans un système\&. Il est possible que la structure de dépendances d\'un système soit tellement corrompue qu\'elle requiert une intervention manuelle (ce qui veut dire la plupart du temps utiliser \fBdselect\fR(8) ou \fBdpkg \-\-remove\fR -pour éliminer les paquets en cause). L'utilisation de cette option conjointement avec +pour éliminer les paquets en cause)\&. L\'utilisation de cette option conjointement avec \fB\-m\fR -peut produire une erreur dans certaines situations. Élément de configuration\ : -APT::Get::Fix\-Broken. +peut produire une erreur dans certaines situations\&. Élément de configuration\ \&: +APT::Get::Fix\-Broken\&. .RE .PP \fB\-m\fR, \fB\-\-ignore\-missing\fR, \fB\-\-fix\-missing\fR -.RS 3n -Ignorer les paquets manquants\ ; si des paquets ne peuvent être récupérés, ou, après récupération, ne satisfont pas au contrôle d'intégrité, cette commande met ces paquets de côté et gère le résultat. Utiliser cette option conjointement avec +.RS 4 +Ignorer les paquets manquants\ \&; si des paquets ne peuvent être récupérés, ou, après récupération, ne satisfont pas au contrôle d\'intégrité, cette commande met ces paquets de côté et gère le résultat\&. Utiliser cette option conjointement avec \fB\-f\fR -peut produire une erreur dans certaines situations. Quand un paquet, sélectionné pour une installation (particulièrement si c'est mentionné en ligne de commande), ne peut être récupéré, il est mis silencieusement de côté. Élément de configuration\ : -APT::Get::Fix\-Missing. +peut produire une erreur dans certaines situations\&. Quand un paquet, sélectionné pour une installation (particulièrement si c\'est mentionné en ligne de commande), ne peut être récupéré, il est mis silencieusement de côté\&. Élément de configuration\ \&: +APT::Get::Fix\-Missing\&. .RE .PP \fB\-\-no\-download\fR -.RS 3n -Pas de récupération. Le mieux est d'utiliser cette option avec +.RS 4 +Pas de récupération\&. Le mieux est d\'utiliser cette option avec \fB\-\-ignore\-missing\fR -pour forcer APT à n'utiliser que les .deb qu'il a déjà récupérés. Élément de configuration\ : -APT::Get::Download. +pour forcer APT à n\'utiliser que les \&.deb qu\'il a déjà récupérés\&. Élément de configuration\ \&: +APT::Get::Download\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; cette commande produit une sortie destinée à l'enregistrement dans un fichier\-journal en omettant les indicateurs de progression. Un plus grand nombre de \(Fo\ q\ \(Fc (2 au plus) produit un plus grand silence. On peut aussi utiliser +.RS 4 +Mode silencieux\ \&; cette commande produit une sortie destinée à l\'enregistrement dans un fichier\-journal en omettant les indicateurs de progression\&. Un plus grand nombre de \(Fo\ \&q\ \&\(Fc (2 au plus) produit un plus grand silence\&. On peut aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, et annuler le fichier de configuration. Notez qu'un niveau de silence égal à 2 implique +pour positionner le niveau de silence, et annuler le fichier de configuration\&. Notez qu\'un niveau de silence égal à 2 implique \fB\-y\fR et vous ne devez jamais utiliser \fB\-qq\fR -sans l'accompagner d'un modificateur tel que +sans l\'accompagner d\'un modificateur tel que \fB\-d\fR, \fB\-\-print\-uris\fR ou -\fB\-s\fR\ : APT pourrait exécuter des actions inattendues\ ! Élément de configuration\ : -quiet. +\fB\-s\fR\ \&: APT pourrait exécuter des actions inattendues\ \&! Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-s\fR, \fB\-\-simulate\fR, \fB\-\-just\-print\fR, \fB\-\-dry\-run\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -Simulation\ ; cette commande réalise une simulation des actions qui seraient exécutées mais ne modifie pas le système. Élément de configuration\ : -APT::Get::Simulate. +.RS 4 +Simulation\ \&; cette commande réalise une simulation des actions qui seraient exécutées mais ne modifie pas le système\&. Élément de configuration\ \&: +APT::Get::Simulate\&. .sp -La simulation affiche une série de lignes représentant chacune une opération de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets encadrent des paquets endommagés et des crochets n'encadrant rien indiquent que les dommages n'ont aucune conséquence (rare). +La simulation affiche une série de lignes représentant chacune une opération de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst)\&. Les crochets encadrent des paquets endommagés et des crochets n\'encadrant rien indiquent que les dommages n\'ont aucune conséquence (rare)\&. .RE .PP \fB\-y\fR, \fB\-\-yes\fR, \fB\-\-assume\-yes\fR -.RS 3n -Répond automatiquement oui aux questions\ ; présume \(Fo\ oui\ \(Fc comme réponse à toutes les questions et s'exécute de manière non interactive. Dans le cas d'une situation indésirable, comme le changement d'un paquet gelé, l'installation d'un paquet non authentifié ou la suppression d'un paquet essentiel, +.RS 4 +Répond automatiquement oui aux questions\ \&; présume \(Fo\ \&oui\ \&\(Fc comme réponse à toutes les questions et s\'exécute de manière non interactive\&. Dans le cas d\'une situation indésirable, comme le changement d\'un paquet gelé, l\'installation d\'un paquet non authentifié ou la suppression d\'un paquet essentiel, apt\-get -s'interrompt. Élément de configuration\ : -APT::Get::Assume\-Yes. +s\'interrompt\&. Élément de configuration\ \&: +APT::Get::Assume\-Yes\&. .RE .PP \fB\-u\fR, \fB\-\-show\-upgraded\fR -.RS 3n -Afficher les paquets mis à niveau\ ; affiche une liste de tous les paquets à mettre à niveau. Élément de configuration\ : -APT::Get::Show\-Upgraded. +.RS 4 +Afficher les paquets mis à niveau\ \&; affiche une liste de tous les paquets à mettre à niveau\&. Élément de configuration\ \&: +APT::Get::Show\-Upgraded\&. .RE .PP \fB\-V\fR, \fB\-\-verbose\-versions\fR -.RS 3n -Afficher les versions complètes des paquets installés ou mis à niveau. Élément de configuration\ : -APT::Get::Show\-Versions. +.RS 4 +Afficher les versions complètes des paquets installés ou mis à niveau\&. Élément de configuration\ \&: +APT::Get::Show\-Versions\&. .RE .PP \fB\-b\fR, \fB\-\-compile\fR, \fB\-\-build\fR -.RS 3n -Cette commande compile un paquet source après l'avoir récupéré. Élément de configuration\ : -APT::Get::Compile. +.RS 4 +Cette commande compile un paquet source après l\'avoir récupéré\&. Élément de configuration\ \&: +APT::Get::Compile\&. .RE .PP \fB\-\-ignore\-hold\fR -.RS 3n -Cette commande ignore la marque \(Fo\ Hold\ \(Fc d'un paquet\ ; par ce biais, +.RS 4 +Cette commande ignore la marque \(Fo\ \&Hold\ \&\(Fc d\'un paquet\ \&; par ce biais, \fBapt\-get\fR -ignore un \(Fo\ hold\ \(Fc placé sur un paquet. cela peut être utile avec +ignore un \(Fo\ \&hold\ \&\(Fc placé sur un paquet\&. cela peut être utile avec dist\-upgrade -pour annuler un grand nombre de \(Fo\ hold\ \(Fc indésirables. Élément de configuration\ : -APT::Ignore\-Hold. +pour annuler un grand nombre de \(Fo\ \&hold\ \&\(Fc indésirables\&. Élément de configuration\ \&: +APT::Ignore\-Hold\&. .RE .PP \fB\-\-no\-upgrade\fR -.RS 3n -Aucune mise à niveau\ ; quand elle est utilisée avec -install, cette commande empêche les paquets listés sur la ligne de commande d'être mis à niveau. Élément de configuration\ : -APT::Get::Upgrade. +.RS 4 +Aucune mise à niveau\ \&; quand elle est utilisée avec +install, cette commande empêche les paquets listés sur la ligne de commande d\'être mis à niveau\&. Élément de configuration\ \&: +APT::Get::Upgrade\&. .RE .PP \fB\-\-force\-yes\fR -.RS 3n -Forcer l'acceptation\ ; cette option est dangereuse parce qu'elle laisse APT continuer sans poser de questions quand il réalise quelque chose de potentiellement dommageable. Cette option ne doit être utilisée que dans des circonstances très spéciales. Utiliser +.RS 4 +Forcer l\'acceptation\ \&; cette option est dangereuse parce qu\'elle laisse APT continuer sans poser de questions quand il réalise quelque chose de potentiellement dommageable\&. Cette option ne doit être utilisée que dans des circonstances très spéciales\&. Utiliser force\-yes -peut détruire le système\ ! Élément de configuration\ : -APT::Get::force\-yes. +peut détruire le système\ \&! Élément de configuration\ \&: +APT::Get::force\-yes\&. .RE .PP \fB\-\-print\-uris\fR -.RS 3n -Au lieu d'aller chercher les paquets à installer, leurs URI sont affichées. Chaque URI a un chemin, un nom de fichier destination, une taille et une clé md5 attendue. Notez que le nom de fichier à afficher ne correspond pas toujours au nom de fichier sur le site distant\ ! Cette option fonctionne aussi avec la commande +.RS 4 +Au lieu d\'aller chercher les paquets à installer, leurs URI sont affichées\&. Chaque URI a un chemin, un nom de fichier destination, une taille et une clé md5 attendue\&. Notez que le nom de fichier à afficher ne correspond pas toujours au nom de fichier sur le site distant\ \&! Cette option fonctionne aussi avec la commande source et avec la commande -update. Avec la commande -update, la somme MD5 et la taille ne sont pas données et c'est à l'utilisateur de décompresser les fichiers compressés. Élément de configuration\ : -APT::Get::Print\-URIs. +update\&. Avec la commande +update, la somme MD5 et la taille ne sont pas données et c\'est à l\'utilisateur de décompresser les fichiers compressés\&. Élément de configuration\ \&: +APT::Get::Print\-URIs\&. .RE .PP \fB\-\-purge\fR -.RS 3n -Utiliser purge à la place de remove pour supprimer tout ce qui peut être supprimé. Un astérisque (*) sera affiché près des paquets qui vont être purgés. Élément de configuration\ : -APT::Get::Purge. +.RS 4 +Utiliser purge à la place de remove pour supprimer tout ce qui peut être supprimé\&. Un astérisque (*) sera affiché près des paquets qui vont être purgés\&. Élément de configuration\ \&: +APT::Get::Purge\&. .RE .PP \fB\-\-reinstall\fR -.RS 3n -Réinstaller les paquets déjà installés avec leur version la plus récente. Élément de configuration\ : -APT::Get::ReInstall. +.RS 4 +Réinstaller les paquets déjà installés avec leur version la plus récente\&. Élément de configuration\ \&: +APT::Get::ReInstall\&. .RE .PP \fB\-\-list\-cleanup\fR -.RS 3n -Cette option est activée par défaut\ ; utilisez +.RS 4 +Cette option est activée par défaut\ \&; utilisez \-\-no\-list\-cleanup -pour la désactiver. Quand elle est activée, +pour la désactiver\&. Quand elle est activée, \fBapt\-get\fR gère automatiquement le contenu de \fI/var/lib/apt/lists\fR -afin d'assurer que les fichiers obsolètes soient effacés. La seule raison de la désactiver est une modification fréquente de votre liste de sources. Élément de configuration\ : -APT::Get::List\-Cleanup. +afin d\'assurer que les fichiers obsolètes soient effacés\&. La seule raison de la désactiver est une modification fréquente de votre liste de sources\&. Élément de configuration\ \&: +APT::Get::List\-Cleanup\&. .RE .PP \fB\-t\fR, \fB\-\-target\-release\fR, \fB\-\-default\-release\fR -.RS 3n -Cette option contrôle l'entrée par défaut pour les questions de distribution\ ; une étiquette (pin) par défaut dont la priorité vaut 990 est créé en utilisant la chaîne spécifiée. Le fichier des préférences peut annuler cette décision. En clair, cette option permet de contrôler simplement dans quelle distribution seront récupérés les paquets. Par exemple\ : -\fB\-t '2.1*'\fR +.RS 4 +Cette option contrôle l\'entrée par défaut pour les questions de distribution\ \&; une étiquette (pin) par défaut dont la priorité vaut 990 est créé en utilisant la chaîne spécifiée\&. Le fichier des préférences peut annuler cette décision\&. En clair, cette option permet de contrôler simplement dans quelle distribution seront récupérés les paquets\&. Par exemple\ \&: +\fB\-t \'2\&.1*\'\fR ou -\fB\-t unstable\fR. Élément de configuration\ : -APT::Default\-Release. Voyez aussi la page de manuel d'\fBapt_preferences\fR(5). +\fB\-t unstable\fR\&. Élément de configuration\ \&: +APT::Default\-Release\&. Voyez aussi la page de manuel d\'\fBapt_preferences\fR(5)\&. .RE .PP \fB\-\-trivial\-only\fR -.RS 3n -Ne réalise que les opérations \(Fo\ triviales\ \(Fc. Logiquement ceci peut être considéré comme relatif à -\fB\-\-assume\-yes\fR. Alors que +.RS 4 +Ne réalise que les opérations \(Fo\ \&triviales\ \&\(Fc\&. Logiquement ceci peut être considéré comme relatif à +\fB\-\-assume\-yes\fR\&. Alors que \fB\-\-assume\-yes\fR -répond oui à n'importe quelle question, +répond oui à n\'importe quelle question, \fB\-\-trivial\-only\fR -répond non. Élément de configuration\ : -APT::Get::Trivial\-Only. +répond non\&. Élément de configuration\ \&: +APT::Get::Trivial\-Only\&. .RE .PP \fB\-\-no\-remove\fR -.RS 3n -Quand des paquets doivent être supprimés, apt\-get s'arrête immédiatement sans poser de questions. Élément de configuration\ : -APT::Get::Remove. +.RS 4 +Quand des paquets doivent être supprimés, apt\-get s\'arrête immédiatement sans poser de questions\&. Élément de configuration\ \&: +APT::Get::Remove\&. .RE .PP \fB\-\-only\-source\fR -.RS 3n -Cette option n'a de sens qu'avec les commandes +.RS 4 +Cette option n\'a de sens qu\'avec les commandes source et -build\-dep. Elle indique que les noms de sources donnés ne doivent pas être repérés à travers le tableau des binaires. Cela signifie que si cette option est choisie, la commande +build\-dep\&. Elle indique que les noms de sources donnés ne doivent pas être repérés à travers le tableau des binaires\&. Cela signifie que si cette option est choisie, la commande source -acceptera seulement des noms de paquets source comme argument\ ; elle n'acceptera pas de les rechercher à partir des noms de paquets binaires correspondants. Élément de configuration\ : +acceptera seulement des noms de paquets source comme argument\ \&; elle n\'acceptera pas de les rechercher à partir des noms de paquets binaires correspondants\&. Élément de configuration\ \&: APT::Get::Only\-Source .RE .PP \fB\-\-diff\-only\fR, \fB\-\-tar\-only\fR -.RS 3n -Ne récupérer que le fichier diff ou tar d'une archive de source. Élément de configuration\ : +.RS 4 +Ne récupérer que le fichier diff ou tar d\'une archive de source\&. Élément de configuration\ \&: APT::Get::Diff\-Only et -APT::Get::Tar\-Only. +APT::Get::Tar\-Only\&. .RE .PP \fB\-\-arch\-only\fR -.RS 3n -Ne traiter que les dépendances de construction pour telle architecture. Élément de configuration\ : +.RS 4 +Ne traiter que les dépendances de construction pour telle architecture\&. Élément de configuration\ \&: APT::Get::Arch\-Only .RE .PP \fB\-\-allow\-unauthenticated\fR -.RS 3n -Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas d'interrogation de l'utilisateur. C'est très utile pour certains outils comme pbuilder Élément de configuration\ : -APT::Get::AllowUnauthenticated. +.RS 4 +Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas d\'interrogation de l\'utilisateur\&. C\'est très utile pour certains outils comme pbuilder Élément de configuration\ \&: +APT::Get::AllowUnauthenticated\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/sources.list\fR -.RS 3n -Liste les emplacements où aller chercher les paquets. Élément de configuration\ : -Dir::Etc::SourceList. +\fI/etc/apt/sources\&.list\fR +.RS 4 +Liste les emplacements où aller chercher les paquets\&. Élément de configuration\ \&: +Dir::Etc::SourceList\&. .RE .PP -\fI/etc/apt/apt.conf\fR -.RS 3n -Fichier de configuration d'APT. Élément de configuration\ : -Dir::Etc::Main. +\fI/etc/apt/apt\&.conf\fR +.RS 4 +Fichier de configuration d\'APT\&. Élément de configuration\ \&: +Dir::Etc::Main\&. .RE .PP -\fI/etc/apt/apt.conf.d/\fR -.RS 3n -Éléments du fichier de configuration d'APT. Élément de configuration\ : -Dir::Etc::Parts. +\fI/etc/apt/apt\&.conf\&.d/\fR +.RS 4 +Éléments du fichier de configuration d\'APT\&. Élément de configuration\ \&: +Dir::Etc::Parts\&. .RE .PP \fI/etc/apt/preferences\fR -.RS 3n -Fichier des préférences. C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est\-à\-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente. Élément de configuration\ : -Dir::Etc::Preferences. +.RS 4 +Fichier des préférences\&. C\'est dans ce fichier qu\'on peut faire de l\'étiquetage (pinning) c\'est\-à\-dire, choisir d\'obtenir des paquets d\'une source distincte ou d\'une distribution différente\&. Élément de configuration\ \&: +Dir::Etc::Preferences\&. .RE .PP \fI/var/cache/apt/archives/\fR -.RS 3n -Zone de stockage pour les paquets récupérés. Élément de configuration\ : -Dir::Cache::Archives. +.RS 4 +Zone de stockage pour les paquets récupérés\&. Élément de configuration\ \&: +Dir::Cache::Archives\&. .RE .PP \fI/var/cache/apt/archives/partial/\fR -.RS 3n -Zone de stockage pour les paquets en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les paquets en transit\&. Élément de configuration\ \&: Dir::Cache::Archives -(implicitement, partial). +(implicitement, partial)\&. .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 Zone de stockage des informations concernant chaque ressource spécifiée dans -\fBsources.list\fR(5). Élément de configuration\ : -Dir::State::Lists. +\fBsources.list\fR(5)\&. Élément de configuration\ \&: +Dir::State::Lists\&. .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n -Zone de stockage pour les informations d'état des paquets en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les informations d\'état des paquets en transit\&. Élément de configuration\ \&: Dir::State::Lists -(implicit partial). +(implicit partial)\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8), -\fBapt\-cdrom\fR(8), +\fBapt-cache\fR(8), +\fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fBsources.list\fR(5), \fBapt.conf\fR(5), -\fBapt\-config\fR(8), le guide \(Fo\ APT users guide\ \(Fc dans /usr/share/doc/apt/, -\fBapt_preferences\fR(5), le guide APT. +\fBapt-config\fR(8), le guide \(Fo\ \&APT users guide\ \&\(Fc dans /usr/share/doc/apt/, +\fBapt_preferences\fR(5), le guide APT\&. .SH "DIAGNOSTIC" .PP \fBapt\-get\fR -renvoie zéro après une opération normale, le décimal 100 en cas d'erreur. +renvoie zéro après une opération normale, le décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-get.fr.8 b/doc/fr/apt-get.fr.8 index b92669d..013d4d0 100644 --- a/doc/fr/apt-get.fr.8 +++ b/doc/fr/apt-get.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-get +.\" Title: apt-get .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-get \- Utilitaire d'APT pour la manipulation de paquets \-\- interface en ligne de commande. +apt-get \- Utilitaire d'APT pour la manipulation de paquets -- interface en ligne de commande. .SH "SYNOPSIS" .HP 8 \fBapt\-get\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] {[update] | [upgrade] | [dselect\-upgrade] | [install\ \fIpaquet\fR...] | [remove\ \fIpaquet\fR...] | [source\ \fIpaquet\fR...] | [build\-dep\ \fIpaquet\fR...] | [check] | [clean] | [autoclean]} @@ -19,473 +19,475 @@ apt\-get \- Utilitaire d'APT pour la manipulation de paquets \-\- interface en l .PP \fBApt\-get\fR -est l'outil en ligne de commande pour manipuler les paquets. Il peut être considéré par l'utilisateur comme un générateur de sortie pour les autres outils de la bibliothèque APT. Plusieurs interfaces utilisateur existent, comme dselect, aptitude, synaptic, gnome\-apt ou wajig. +est l\'outil en ligne de commande pour manipuler les paquets\&. Il peut être considéré par l\'utilisateur comme un générateur de sortie pour les autres outils de la bibliothèque APT\&. Plusieurs interfaces utilisateur existent, comme dselect, aptitude, synaptic, gnome\-apt ou wajig\&. .PP -À moins que l'option +À moins que l\'option \fB\-h\fR, ou \fB\-\-help\fR -ne soit donnée, l'une des commandes suivantes doit être présente. +ne soit donnée, l\'une des commandes suivantes doit être présente\&. .PP update -.RS 3n +.RS 4 La commande update -permet de resynchroniser un fichier répertoriant les paquets disponibles et sa source. Ces fichiers sont récupérés aux endroits spécifiés dans -\fI/etc/apt/sources.list\fR. Ainsi, lorsqu'on utilise une archive Debian, cette commande récupère les fichiers -\fIPackages.gz\fR -et les analyse de manière à rendre disponibles les informations concernant les nouveaux paquets et les paquets mis à jour. On doit toujours exécuter une commande +permet de resynchroniser un fichier répertoriant les paquets disponibles et sa source\&. Ces fichiers sont récupérés aux endroits spécifiés dans +\fI/etc/apt/sources\&.list\fR\&. Ainsi, lorsqu\'on utilise une archive Debian, cette commande récupère les fichiers +\fIPackages\&.gz\fR +et les analyse de manière à rendre disponibles les informations concernant les nouveaux paquets et les paquets mis à jour\&. On doit toujours exécuter une commande update avant les commandes upgrade ou -dist\-upgrade. Il faut savoir que l'indicateur de progression d'ensemble n'est pas correct puisque la taille de ces fichiers ne peut être connue à l'avance. +dist\-upgrade\&. Il faut savoir que l\'indicateur de progression d\'ensemble n\'est pas correct puisque la taille de ces fichiers ne peut être connue à l\'avance\&. .RE .PP upgrade -.RS 3n +.RS 4 La commande upgrade -permet d'installer les versions les plus récentes de tous les paquets présents sur le système en utilisant les sources énumérées dans -\fI/etc/apt/sources.list\fR. Les paquets installés dont il existe de nouvelles versions sont récupérés et mis à niveau. En aucun cas des paquets déjà installés ne sont supprimés\ ; de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni installés. Les paquets dont de nouvelles versions ne peuvent pas être installées sans changer le statut d'installation d'un autre paquet sont laissés dans leur version courante. On doit d'abord exécuter la commande +permet d\'installer les versions les plus récentes de tous les paquets présents sur le système en utilisant les sources énumérées dans +\fI/etc/apt/sources\&.list\fR\&. Les paquets installés dont il existe de nouvelles versions sont récupérés et mis à niveau\&. En aucun cas des paquets déjà installés ne sont supprimés\ \&; de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni installés\&. Les paquets dont de nouvelles versions ne peuvent pas être installées sans changer le statut d\'installation d\'un autre paquet sont laissés dans leur version courante\&. On doit d\'abord exécuter la commande update pour que \fBapt\-get\fR -connaisse l'existence de nouvelles versions des paquets. +connaisse l\'existence de nouvelles versions des paquets\&. .RE .PP dselect\-upgrade -.RS 3n +.RS 4 dselect\-upgrade est utilisée conjointement avec -\fBdselect\fR(8), l'interface traditionnelle Debian pour la gestion des paquets. La commande +\fBdselect\fR(8), l\'interface traditionnelle Debian pour la gestion des paquets\&. La commande dselect\-upgrade suit les modifications faites par \fBdselect\fR(8) dans le champ Status -des paquets disponibles, et effectue les actions nécessaires à la réalisation de cet état (par exemple, suppression d'anciens paquets, installation de nouveaux paquets). +des paquets disponibles, et effectue les actions nécessaires à la réalisation de cet état (par exemple, suppression d\'anciens paquets, installation de nouveaux paquets)\&. .RE .PP dist\-upgrade -.RS 3n +.RS 4 La commande dist\-upgrade effectue la fonction upgrade -en y ajoutant une gestion intelligente des changements de dépendances dans les nouvelles versions des paquets\ ; +en y ajoutant une gestion intelligente des changements de dépendances dans les nouvelles versions des paquets\ \&; \fBapt\-get\fR -possède un système \(Fo\ intelligent\ \(Fc de résolution des conflits et il essaye, quand c'est nécessaire, de mettre à niveau les paquets les plus importants aux dépens des paquets les moins importants. Le fichier -\fI/etc/apt/sources.list\fR -contient une liste de sources où récupérer les paquets désirés. Voyez aussi +possède un système \(Fo\ \&intelligent\ \&\(Fc de résolution des conflits et il essaye, quand c\'est nécessaire, de mettre à niveau les paquets les plus importants aux dépens des paquets les moins importants\&. Le fichier +\fI/etc/apt/sources\&.list\fR +contient une liste de sources où récupérer les paquets désirés\&. Voyez aussi \fBapt_preferences\fR(5) -pour un mécanisme de remplacement des paramètres généraux pour certains paquets. +pour un mécanisme de remplacement des paramètres généraux pour certains paquets\&. .RE .PP install -.RS 3n +.RS 4 La commande install -est suivie par un ou plusieurs paquets à installer. Chaque paquet est un nom de paquet\ ; ce n'est pas un nom de fichier entièrement défini (par exemple, dans un système Debian GNU/Linux, on indiquera libc6 et non pas -libc6_1.9.6\-2.deb). Tous les paquets requis par le(s) paquet(s) que l'on veut installer sont aussi récupérés et installés. On se sert du fichier -\fI/etc/apt/sources.list\fR -pour localiser les paquets désirés. Quand un trait d'union est accolé (sans espace intermédiaire) au nom d'un paquet déjà installé, ce paquet est supprimé. De même on peut ajouter un signe \(Fo\ +\ \(Fc pour désigner un paquet à installer. Cette dernière fonctionnalité peut être utilisée pour annuler les décisions prises par le système de résolution des conflits d'apt\-get. +est suivie par un ou plusieurs paquets à installer\&. Chaque paquet est un nom de paquet\ \&; ce n\'est pas un nom de fichier entièrement défini (par exemple, dans un système Debian GNU/Linux, on indiquera libc6 et non pas +libc6_1\&.9\&.6\-2\&.deb)\&. Tous les paquets requis par le(s) paquet(s) que l\'on veut installer sont aussi récupérés et installés\&. On se sert du fichier +\fI/etc/apt/sources\&.list\fR +pour localiser les paquets désirés\&. Quand un trait d\'union est accolé (sans espace intermédiaire) au nom d\'un paquet déjà installé, ce paquet est supprimé\&. De même on peut ajouter un signe \(Fo\ \&+\ \&\(Fc pour désigner un paquet à installer\&. Cette dernière fonctionnalité peut être utilisée pour annuler les décisions prises par le système de résolution des conflits d\'apt\-get\&. .sp -On peut choisir d'installer une version particulière d'un paquet en faisant suivre son nom par un signe égal et par la version. Cette version sera localisée et l'installation sera demandée. On peut aussi choisir une distribution particulière en faisant suivre le nom du paquet par une barre oblique et par le nom de la distribution ou de l'archive (stable, testing, unstable). +On peut choisir d\'installer une version particulière d\'un paquet en faisant suivre son nom par un signe égal et par la version\&. Cette version sera localisée et l\'installation sera demandée\&. On peut aussi choisir une distribution particulière en faisant suivre le nom du paquet par une barre oblique et par le nom de la distribution ou de l\'archive (stable, testing, unstable)\&. .sp -Avec ces possibilités de choisir la version, de vieilles versions d'un paquet peuvent être installées. Il faut faire attention. +Avec ces possibilités de choisir la version, de vieilles versions d\'un paquet peuvent être installées\&. Il faut faire attention\&. .sp -Enfin, le mécanisme d'\fBapt_preferences\fR(5) -permet de créer d'autres règles pour l'installation des paquets. +Enfin, le mécanisme d\'\fBapt_preferences\fR(5) +permet de créer d\'autres règles pour l\'installation des paquets\&. .sp -Quand aucun paquet ne correspond à l'expression donnée en argument et que cette expression contient l'un des caractères \(Fo\ .\ \(Fc, \(Fo\ ?\ \(Fc ou \(Fo\ *\ \(Fc, on considère que c'est une expression rationnelle POSIX et elle est appliquée à tous les paquets de la base de données. Tout paquet correspondant est installé (ou supprimé). Notez que la comparaison est effectuée par sous\-chaîne et \(Fo\ lo\ \(Fc correspond aussi bien à \(Fo\ how\-lo\ \(Fc qu'à \(Fo\ lowest\ \(Fc. Si vous ne le voulez pas, ancrez l'expression par un caractère \(Fo\ ^\ \(Fc ou un caractère \(Fo\ $\ \(Fc, ou bien créez une expression plus précise. +Quand aucun paquet ne correspond à l\'expression donnée en argument et que cette expression contient l\'un des caractères \(Fo\ \&\&.\ \&\(Fc, \(Fo\ \&?\ \&\(Fc ou \(Fo\ \&*\ \&\(Fc, on considère que c\'est une expression rationnelle POSIX et elle est appliquée à tous les paquets de la base de données\&. Tout paquet correspondant est installé (ou supprimé)\&. Notez que la comparaison est effectuée par sous\-chaîne et \(Fo\ \&lo\ \&\(Fc correspond aussi bien à \(Fo\ \&how\-lo\ \&\(Fc qu\'à \(Fo\ \&lowest\ \&\(Fc\&. Si vous ne le voulez pas, ancrez l\'expression par un caractère \(Fo\ \&^\ \&\(Fc ou un caractère \(Fo\ \&$\ \&\(Fc, ou bien créez une expression plus précise\&. .RE .PP remove -.RS 3n +.RS 4 La commande remove est identique à la commande -install\ ; Mais les paquets sont supprimés et non pas installés. Quand un signe plus est accolé (sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu d'être supprimé. +install\ \&; Mais les paquets sont supprimés et non pas installés\&. Quand un signe plus est accolé (sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu d\'être supprimé\&. .RE .PP source -.RS 3n +.RS 4 Avec la commande source, \fBapt\-get\fR -récupère des paquets sources. APT examine les paquets disponibles pour choisir le paquet source à récupérer. Il trouve ensuite et télécharge dans le répertoire courant la version la plus récente. Les paquets source sont gérés indépendamment des paquets binaires, via les lignes de type +récupère des paquets sources\&. APT examine les paquets disponibles pour choisir le paquet source à récupérer\&. Il trouve ensuite et télécharge dans le répertoire courant la version la plus récente\&. Les paquets source sont gérés indépendamment des paquets binaires, via les lignes de type deb\-src dans le fichier -\fBsources.list\fR(5). On n'obtiendra probablement pas les mêmes sources que celles du paquet installé ou celles du paquet qu'on pourrait installer. Si l'option +\fBsources.list\fR(5)\&. On n\'obtiendra probablement pas les mêmes sources que celles du paquet installé ou celles du paquet qu\'on pourrait installer\&. Si l\'option \fB\-\-compile\fR -est spécifiée, le paquet est compilé en un binaire .deb avec -\fBdpkg\-buildpackage\fR. Si +est spécifiée, le paquet est compilé en un binaire \&.deb avec +\fBdpkg\-buildpackage\fR\&. Si \fB\-\-download\-only\fR -est spécifié, le source n'est pas décompacté. +est spécifié, le source n\'est pas décompacté\&. .sp -De la même façon qu'avec les paquets binaires, on peut récupérer une version particulière d'un paquet source en faisant suivre son nom par un signe égal et par la version. Cela permet une comparaison exacte entre le nom du paquet source et la version\ ; cela lance implicitement la commande -APT::Get::Only\-Source. +De la même façon qu\'avec les paquets binaires, on peut récupérer une version particulière d\'un paquet source en faisant suivre son nom par un signe égal et par la version\&. Cela permet une comparaison exacte entre le nom du paquet source et la version\ \&; cela lance implicitement la commande +APT::Get::Only\-Source\&. .sp -Notez que les paquets sources ne sont pas suivis comme le sont les paquets binaires. Ils ne sont présents que dans le répertoire courant et sont semblables à des sources téléchargés sous forme de tarball. +Notez que les paquets sources ne sont pas suivis comme le sont les paquets binaires\&. Ils ne sont présents que dans le répertoire courant et sont semblables à des sources téléchargés sous forme de tarball\&. .RE .PP build\-dep -.RS 3n +.RS 4 Avec la commande -build\-dep, apt\-get installe ou supprime des paquets dans le but de satisfaire les dépendances de construction d'un paquet source. Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au hasard. +build\-dep, apt\-get installe ou supprime des paquets dans le but de satisfaire les dépendances de construction d\'un paquet source\&. Pour l\'instant, dans la cas d\'un paquet virtuel, un paquet est choisi au hasard\&. .RE .PP check -.RS 3n +.RS 4 La commande check -est un outil de diagnostic\ ; il met à jour le cache des paquets et cherche des dépendances défectueuses. +est un outil de diagnostic\ \&; il met à jour le cache des paquets et cherche des dépendances défectueuses\&. .RE .PP clean -.RS 3n +.RS 4 La commande clean -nettoie le référentiel local des paquets récupérés. Il supprime tout, excepté le fichier lock situé dans +nettoie le référentiel local des paquets récupérés\&. Il supprime tout, excepté le fichier lock situé dans \fI/var/cache/apt/archives/\fR et -\fI/var/cache/apt/archives/partial/\fR. Quand APT est utilisé comme mode de +\fI/var/cache/apt/archives/partial/\fR\&. Quand APT est utilisé comme mode de \fBdselect\fR(8), clean -est effectué automatiquement. Quand on n'utilise pas dselect, il faut exécuter +est effectué automatiquement\&. Quand on n\'utilise pas dselect, il faut exécuter apt\-get clean -de temps en temps si l'on veut libérer de l'espace disque. +de temps en temps si l\'on veut libérer de l\'espace disque\&. .RE .PP autoclean -.RS 3n +.RS 4 Tout comme clean, autoclean -nettoie le référentiel local des paquets récupérés. La différence est qu'il supprime uniquement les paquets qui ne peuvent plus être téléchargés et qui sont grandement inutiles. On peut ainsi contrôler la taille de ce cache sur une longue période. Tant qu'elle n'est pas activée, l'option de configuration +nettoie le référentiel local des paquets récupérés\&. La différence est qu\'il supprime uniquement les paquets qui ne peuvent plus être téléchargés et qui sont grandement inutiles\&. On peut ainsi contrôler la taille de ce cache sur une longue période\&. Tant qu\'elle n\'est pas activée, l\'option de configuration APT::Clean\-Installed -empêche la suppression de paquets installés. +empêche la suppression de paquets installés\&. .RE .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-d\fR, \fB\-\-download\-only\fR -.RS 3n -Récupération seule\ ; les paquets sont récupérés mais ne sont ni dépaquetés ni installés. Élément de configuration\ : -APT::Get::Download\-Only. +.RS 4 +Récupération seule\ \&; les paquets sont récupérés mais ne sont ni dépaquetés ni installés\&. Élément de configuration\ \&: +APT::Get::Download\-Only\&. .RE .PP \fB\-f\fR, \fB\-\-fix\-broken\fR -.RS 3n -Correction\ ; essaye de réparer un système dont les dépendances sont défectueuses. Cette option, utilisée avec install ou remove, peut omettre tout paquet de façon à permettre à APT de déduire une solution viable. Chaque paquet spécifié doit complètement corriger le problème. Cette option est quelquefois nécessaire lorsque l'on exécute APT pour la première fois\ ; APT lui\-même interdit les dépendances défectueuses dans un système. Il est possible que la structure de dépendances d'un système soit tellement corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la plupart du temps utiliser +.RS 4 +Correction\ \&; essaye de réparer un système dont les dépendances sont défectueuses\&. Cette option, utilisée avec install ou remove, peut omettre tout paquet de façon à permettre à APT de déduire une solution viable\&. Chaque paquet spécifié doit complètement corriger le problème\&. Cette option est quelquefois nécessaire lorsque l\'on exécute APT pour la première fois\ \&; APT lui\-même interdit les dépendances défectueuses dans un système\&. Il est possible que la structure de dépendances d\'un système soit tellement corrompue qu\'elle requiert une intervention manuelle (ce qui veut dire la plupart du temps utiliser \fBdselect\fR(8) ou \fBdpkg \-\-remove\fR -pour éliminer les paquets en cause). L'utilisation de cette option conjointement avec +pour éliminer les paquets en cause)\&. L\'utilisation de cette option conjointement avec \fB\-m\fR -peut produire une erreur dans certaines situations. Élément de configuration\ : -APT::Get::Fix\-Broken. +peut produire une erreur dans certaines situations\&. Élément de configuration\ \&: +APT::Get::Fix\-Broken\&. .RE .PP \fB\-m\fR, \fB\-\-ignore\-missing\fR, \fB\-\-fix\-missing\fR -.RS 3n -Ignorer les paquets manquants\ ; si des paquets ne peuvent être récupérés, ou, après récupération, ne satisfont pas au contrôle d'intégrité, cette commande met ces paquets de côté et gère le résultat. Utiliser cette option conjointement avec +.RS 4 +Ignorer les paquets manquants\ \&; si des paquets ne peuvent être récupérés, ou, après récupération, ne satisfont pas au contrôle d\'intégrité, cette commande met ces paquets de côté et gère le résultat\&. Utiliser cette option conjointement avec \fB\-f\fR -peut produire une erreur dans certaines situations. Quand un paquet, sélectionné pour une installation (particulièrement si c'est mentionné en ligne de commande), ne peut être récupéré, il est mis silencieusement de côté. Élément de configuration\ : -APT::Get::Fix\-Missing. +peut produire une erreur dans certaines situations\&. Quand un paquet, sélectionné pour une installation (particulièrement si c\'est mentionné en ligne de commande), ne peut être récupéré, il est mis silencieusement de côté\&. Élément de configuration\ \&: +APT::Get::Fix\-Missing\&. .RE .PP \fB\-\-no\-download\fR -.RS 3n -Pas de récupération. Le mieux est d'utiliser cette option avec +.RS 4 +Pas de récupération\&. Le mieux est d\'utiliser cette option avec \fB\-\-ignore\-missing\fR -pour forcer APT à n'utiliser que les .deb qu'il a déjà récupérés. Élément de configuration\ : -APT::Get::Download. +pour forcer APT à n\'utiliser que les \&.deb qu\'il a déjà récupérés\&. Élément de configuration\ \&: +APT::Get::Download\&. .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n -Mode silencieux\ ; cette commande produit une sortie destinée à l'enregistrement dans un fichier\-journal en omettant les indicateurs de progression. Un plus grand nombre de \(Fo\ q\ \(Fc (2 au plus) produit un plus grand silence. On peut aussi utiliser +.RS 4 +Mode silencieux\ \&; cette commande produit une sortie destinée à l\'enregistrement dans un fichier\-journal en omettant les indicateurs de progression\&. Un plus grand nombre de \(Fo\ \&q\ \&\(Fc (2 au plus) produit un plus grand silence\&. On peut aussi utiliser \fB\-q=#\fR -pour positionner le niveau de silence, et annuler le fichier de configuration. Notez qu'un niveau de silence égal à 2 implique +pour positionner le niveau de silence, et annuler le fichier de configuration\&. Notez qu\'un niveau de silence égal à 2 implique \fB\-y\fR et vous ne devez jamais utiliser \fB\-qq\fR -sans l'accompagner d'un modificateur tel que +sans l\'accompagner d\'un modificateur tel que \fB\-d\fR, \fB\-\-print\-uris\fR ou -\fB\-s\fR\ : APT pourrait exécuter des actions inattendues\ ! Élément de configuration\ : -quiet. +\fB\-s\fR\ \&: APT pourrait exécuter des actions inattendues\ \&! Élément de configuration\ \&: +quiet\&. .RE .PP \fB\-s\fR, \fB\-\-simulate\fR, \fB\-\-just\-print\fR, \fB\-\-dry\-run\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n -Simulation\ ; cette commande réalise une simulation des actions qui seraient exécutées mais ne modifie pas le système. Élément de configuration\ : -APT::Get::Simulate. +.RS 4 +Simulation\ \&; cette commande réalise une simulation des actions qui seraient exécutées mais ne modifie pas le système\&. Élément de configuration\ \&: +APT::Get::Simulate\&. .sp -La simulation affiche une série de lignes représentant chacune une opération de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets encadrent des paquets endommagés et des crochets n'encadrant rien indiquent que les dommages n'ont aucune conséquence (rare). +La simulation affiche une série de lignes représentant chacune une opération de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst)\&. Les crochets encadrent des paquets endommagés et des crochets n\'encadrant rien indiquent que les dommages n\'ont aucune conséquence (rare)\&. .RE .PP \fB\-y\fR, \fB\-\-yes\fR, \fB\-\-assume\-yes\fR -.RS 3n -Répond automatiquement oui aux questions\ ; présume \(Fo\ oui\ \(Fc comme réponse à toutes les questions et s'exécute de manière non interactive. Dans le cas d'une situation indésirable, comme le changement d'un paquet gelé, l'installation d'un paquet non authentifié ou la suppression d'un paquet essentiel, +.RS 4 +Répond automatiquement oui aux questions\ \&; présume \(Fo\ \&oui\ \&\(Fc comme réponse à toutes les questions et s\'exécute de manière non interactive\&. Dans le cas d\'une situation indésirable, comme le changement d\'un paquet gelé, l\'installation d\'un paquet non authentifié ou la suppression d\'un paquet essentiel, apt\-get -s'interrompt. Élément de configuration\ : -APT::Get::Assume\-Yes. +s\'interrompt\&. Élément de configuration\ \&: +APT::Get::Assume\-Yes\&. .RE .PP \fB\-u\fR, \fB\-\-show\-upgraded\fR -.RS 3n -Afficher les paquets mis à niveau\ ; affiche une liste de tous les paquets à mettre à niveau. Élément de configuration\ : -APT::Get::Show\-Upgraded. +.RS 4 +Afficher les paquets mis à niveau\ \&; affiche une liste de tous les paquets à mettre à niveau\&. Élément de configuration\ \&: +APT::Get::Show\-Upgraded\&. .RE .PP \fB\-V\fR, \fB\-\-verbose\-versions\fR -.RS 3n -Afficher les versions complètes des paquets installés ou mis à niveau. Élément de configuration\ : -APT::Get::Show\-Versions. +.RS 4 +Afficher les versions complètes des paquets installés ou mis à niveau\&. Élément de configuration\ \&: +APT::Get::Show\-Versions\&. .RE .PP \fB\-b\fR, \fB\-\-compile\fR, \fB\-\-build\fR -.RS 3n -Cette commande compile un paquet source après l'avoir récupéré. Élément de configuration\ : -APT::Get::Compile. +.RS 4 +Cette commande compile un paquet source après l\'avoir récupéré\&. Élément de configuration\ \&: +APT::Get::Compile\&. .RE .PP \fB\-\-ignore\-hold\fR -.RS 3n -Cette commande ignore la marque \(Fo\ Hold\ \(Fc d'un paquet\ ; par ce biais, +.RS 4 +Cette commande ignore la marque \(Fo\ \&Hold\ \&\(Fc d\'un paquet\ \&; par ce biais, \fBapt\-get\fR -ignore un \(Fo\ hold\ \(Fc placé sur un paquet. cela peut être utile avec +ignore un \(Fo\ \&hold\ \&\(Fc placé sur un paquet\&. cela peut être utile avec dist\-upgrade -pour annuler un grand nombre de \(Fo\ hold\ \(Fc indésirables. Élément de configuration\ : -APT::Ignore\-Hold. +pour annuler un grand nombre de \(Fo\ \&hold\ \&\(Fc indésirables\&. Élément de configuration\ \&: +APT::Ignore\-Hold\&. .RE .PP \fB\-\-no\-upgrade\fR -.RS 3n -Aucune mise à niveau\ ; quand elle est utilisée avec -install, cette commande empêche les paquets listés sur la ligne de commande d'être mis à niveau. Élément de configuration\ : -APT::Get::Upgrade. +.RS 4 +Aucune mise à niveau\ \&; quand elle est utilisée avec +install, cette commande empêche les paquets listés sur la ligne de commande d\'être mis à niveau\&. Élément de configuration\ \&: +APT::Get::Upgrade\&. .RE .PP \fB\-\-force\-yes\fR -.RS 3n -Forcer l'acceptation\ ; cette option est dangereuse parce qu'elle laisse APT continuer sans poser de questions quand il réalise quelque chose de potentiellement dommageable. Cette option ne doit être utilisée que dans des circonstances très spéciales. Utiliser +.RS 4 +Forcer l\'acceptation\ \&; cette option est dangereuse parce qu\'elle laisse APT continuer sans poser de questions quand il réalise quelque chose de potentiellement dommageable\&. Cette option ne doit être utilisée que dans des circonstances très spéciales\&. Utiliser force\-yes -peut détruire le système\ ! Élément de configuration\ : -APT::Get::force\-yes. +peut détruire le système\ \&! Élément de configuration\ \&: +APT::Get::force\-yes\&. .RE .PP \fB\-\-print\-uris\fR -.RS 3n -Au lieu d'aller chercher les paquets à installer, leurs URI sont affichées. Chaque URI a un chemin, un nom de fichier destination, une taille et une clé md5 attendue. Notez que le nom de fichier à afficher ne correspond pas toujours au nom de fichier sur le site distant\ ! Cette option fonctionne aussi avec la commande +.RS 4 +Au lieu d\'aller chercher les paquets à installer, leurs URI sont affichées\&. Chaque URI a un chemin, un nom de fichier destination, une taille et une clé md5 attendue\&. Notez que le nom de fichier à afficher ne correspond pas toujours au nom de fichier sur le site distant\ \&! Cette option fonctionne aussi avec la commande source et avec la commande -update. Avec la commande -update, la somme MD5 et la taille ne sont pas données et c'est à l'utilisateur de décompresser les fichiers compressés. Élément de configuration\ : -APT::Get::Print\-URIs. +update\&. Avec la commande +update, la somme MD5 et la taille ne sont pas données et c\'est à l\'utilisateur de décompresser les fichiers compressés\&. Élément de configuration\ \&: +APT::Get::Print\-URIs\&. .RE .PP \fB\-\-purge\fR -.RS 3n -Utiliser purge à la place de remove pour supprimer tout ce qui peut être supprimé. Un astérisque (*) sera affiché près des paquets qui vont être purgés. Élément de configuration\ : -APT::Get::Purge. +.RS 4 +Utiliser purge à la place de remove pour supprimer tout ce qui peut être supprimé\&. Un astérisque (*) sera affiché près des paquets qui vont être purgés\&. Élément de configuration\ \&: +APT::Get::Purge\&. .RE .PP \fB\-\-reinstall\fR -.RS 3n -Réinstaller les paquets déjà installés avec leur version la plus récente. Élément de configuration\ : -APT::Get::ReInstall. +.RS 4 +Réinstaller les paquets déjà installés avec leur version la plus récente\&. Élément de configuration\ \&: +APT::Get::ReInstall\&. .RE .PP \fB\-\-list\-cleanup\fR -.RS 3n -Cette option est activée par défaut\ ; utilisez +.RS 4 +Cette option est activée par défaut\ \&; utilisez \-\-no\-list\-cleanup -pour la désactiver. Quand elle est activée, +pour la désactiver\&. Quand elle est activée, \fBapt\-get\fR gère automatiquement le contenu de \fI/var/lib/apt/lists\fR -afin d'assurer que les fichiers obsolètes soient effacés. La seule raison de la désactiver est une modification fréquente de votre liste de sources. Élément de configuration\ : -APT::Get::List\-Cleanup. +afin d\'assurer que les fichiers obsolètes soient effacés\&. La seule raison de la désactiver est une modification fréquente de votre liste de sources\&. Élément de configuration\ \&: +APT::Get::List\-Cleanup\&. .RE .PP \fB\-t\fR, \fB\-\-target\-release\fR, \fB\-\-default\-release\fR -.RS 3n -Cette option contrôle l'entrée par défaut pour les questions de distribution\ ; une étiquette (pin) par défaut dont la priorité vaut 990 est créé en utilisant la chaîne spécifiée. Le fichier des préférences peut annuler cette décision. En clair, cette option permet de contrôler simplement dans quelle distribution seront récupérés les paquets. Par exemple\ : -\fB\-t '2.1*'\fR +.RS 4 +Cette option contrôle l\'entrée par défaut pour les questions de distribution\ \&; une étiquette (pin) par défaut dont la priorité vaut 990 est créé en utilisant la chaîne spécifiée\&. Le fichier des préférences peut annuler cette décision\&. En clair, cette option permet de contrôler simplement dans quelle distribution seront récupérés les paquets\&. Par exemple\ \&: +\fB\-t \'2\&.1*\'\fR ou -\fB\-t unstable\fR. Élément de configuration\ : -APT::Default\-Release. Voyez aussi la page de manuel d'\fBapt_preferences\fR(5). +\fB\-t unstable\fR\&. Élément de configuration\ \&: +APT::Default\-Release\&. Voyez aussi la page de manuel d\'\fBapt_preferences\fR(5)\&. .RE .PP \fB\-\-trivial\-only\fR -.RS 3n -Ne réalise que les opérations \(Fo\ triviales\ \(Fc. Logiquement ceci peut être considéré comme relatif à -\fB\-\-assume\-yes\fR. Alors que +.RS 4 +Ne réalise que les opérations \(Fo\ \&triviales\ \&\(Fc\&. Logiquement ceci peut être considéré comme relatif à +\fB\-\-assume\-yes\fR\&. Alors que \fB\-\-assume\-yes\fR -répond oui à n'importe quelle question, +répond oui à n\'importe quelle question, \fB\-\-trivial\-only\fR -répond non. Élément de configuration\ : -APT::Get::Trivial\-Only. +répond non\&. Élément de configuration\ \&: +APT::Get::Trivial\-Only\&. .RE .PP \fB\-\-no\-remove\fR -.RS 3n -Quand des paquets doivent être supprimés, apt\-get s'arrête immédiatement sans poser de questions. Élément de configuration\ : -APT::Get::Remove. +.RS 4 +Quand des paquets doivent être supprimés, apt\-get s\'arrête immédiatement sans poser de questions\&. Élément de configuration\ \&: +APT::Get::Remove\&. .RE .PP \fB\-\-only\-source\fR -.RS 3n -Cette option n'a de sens qu'avec les commandes +.RS 4 +Cette option n\'a de sens qu\'avec les commandes source et -build\-dep. Elle indique que les noms de sources donnés ne doivent pas être repérés à travers le tableau des binaires. Cela signifie que si cette option est choisie, la commande +build\-dep\&. Elle indique que les noms de sources donnés ne doivent pas être repérés à travers le tableau des binaires\&. Cela signifie que si cette option est choisie, la commande source -acceptera seulement des noms de paquets source comme argument\ ; elle n'acceptera pas de les rechercher à partir des noms de paquets binaires correspondants. Élément de configuration\ : +acceptera seulement des noms de paquets source comme argument\ \&; elle n\'acceptera pas de les rechercher à partir des noms de paquets binaires correspondants\&. Élément de configuration\ \&: APT::Get::Only\-Source .RE .PP \fB\-\-diff\-only\fR, \fB\-\-tar\-only\fR -.RS 3n -Ne récupérer que le fichier diff ou tar d'une archive de source. Élément de configuration\ : +.RS 4 +Ne récupérer que le fichier diff ou tar d\'une archive de source\&. Élément de configuration\ \&: APT::Get::Diff\-Only et -APT::Get::Tar\-Only. +APT::Get::Tar\-Only\&. .RE .PP \fB\-\-arch\-only\fR -.RS 3n -Ne traiter que les dépendances de construction pour telle architecture. Élément de configuration\ : +.RS 4 +Ne traiter que les dépendances de construction pour telle architecture\&. Élément de configuration\ \&: APT::Get::Arch\-Only .RE .PP \fB\-\-allow\-unauthenticated\fR -.RS 3n -Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas d'interrogation de l'utilisateur. C'est très utile pour certains outils comme pbuilder Élément de configuration\ : -APT::Get::AllowUnauthenticated. +.RS 4 +Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas d\'interrogation de l\'utilisateur\&. C\'est très utile pour certains outils comme pbuilder Élément de configuration\ \&: +APT::Get::AllowUnauthenticated\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/sources.list\fR -.RS 3n -Liste les emplacements où aller chercher les paquets. Élément de configuration\ : -Dir::Etc::SourceList. +\fI/etc/apt/sources\&.list\fR +.RS 4 +Liste les emplacements où aller chercher les paquets\&. Élément de configuration\ \&: +Dir::Etc::SourceList\&. .RE .PP -\fI/etc/apt/apt.conf\fR -.RS 3n -Fichier de configuration d'APT. Élément de configuration\ : -Dir::Etc::Main. +\fI/etc/apt/apt\&.conf\fR +.RS 4 +Fichier de configuration d\'APT\&. Élément de configuration\ \&: +Dir::Etc::Main\&. .RE .PP -\fI/etc/apt/apt.conf.d/\fR -.RS 3n -Éléments du fichier de configuration d'APT. Élément de configuration\ : -Dir::Etc::Parts. +\fI/etc/apt/apt\&.conf\&.d/\fR +.RS 4 +Éléments du fichier de configuration d\'APT\&. Élément de configuration\ \&: +Dir::Etc::Parts\&. .RE .PP \fI/etc/apt/preferences\fR -.RS 3n -Fichier des préférences. C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est\-à\-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente. Élément de configuration\ : -Dir::Etc::Preferences. +.RS 4 +Fichier des préférences\&. C\'est dans ce fichier qu\'on peut faire de l\'étiquetage (pinning) c\'est\-à\-dire, choisir d\'obtenir des paquets d\'une source distincte ou d\'une distribution différente\&. Élément de configuration\ \&: +Dir::Etc::Preferences\&. .RE .PP \fI/var/cache/apt/archives/\fR -.RS 3n -Zone de stockage pour les paquets récupérés. Élément de configuration\ : -Dir::Cache::Archives. +.RS 4 +Zone de stockage pour les paquets récupérés\&. Élément de configuration\ \&: +Dir::Cache::Archives\&. .RE .PP \fI/var/cache/apt/archives/partial/\fR -.RS 3n -Zone de stockage pour les paquets en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les paquets en transit\&. Élément de configuration\ \&: Dir::Cache::Archives -(implicitement, partial). +(implicitement, partial)\&. .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 Zone de stockage des informations concernant chaque ressource spécifiée dans -\fBsources.list\fR(5). Élément de configuration\ : -Dir::State::Lists. +\fBsources.list\fR(5)\&. Élément de configuration\ \&: +Dir::State::Lists\&. .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n -Zone de stockage pour les informations d'état des paquets en transit. Élément de configuration\ : +.RS 4 +Zone de stockage pour les informations d\'état des paquets en transit\&. Élément de configuration\ \&: Dir::State::Lists -(implicit partial). +(implicit partial)\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8), -\fBapt\-cdrom\fR(8), +\fBapt-cache\fR(8), +\fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fBsources.list\fR(5), \fBapt.conf\fR(5), -\fBapt\-config\fR(8), le guide \(Fo\ APT users guide\ \(Fc dans /usr/share/doc/apt/, -\fBapt_preferences\fR(5), le guide APT. +\fBapt-config\fR(8), le guide \(Fo\ \&APT users guide\ \&\(Fc dans /usr/share/doc/apt/, +\fBapt_preferences\fR(5), le guide APT\&. .SH "DIAGNOSTIC" .PP \fBapt\-get\fR -renvoie zéro après une opération normale, le décimal 100 en cas d'erreur. +renvoie zéro après une opération normale, le décimal 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-key.8 b/doc/fr/apt-key.8 index b5a867a..9e42167 100644 --- a/doc/fr/apt-key.8 +++ b/doc/fr/apt-key.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-key +.\" Title: apt-key .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 décembre 2003 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-key \- Utilitaire de gestion des clés +apt-key \- Utilitaire de gestion des clés .SH "SYNOPSIS" .HP 8 \fBapt\-key\fR [\fIcommand\fR/] [\fB\fIarguments\fR\fR...] @@ -19,83 +19,85 @@ apt\-key \- Utilitaire de gestion des cl .PP \fBapt\-key\fR -gère les clés dont se sert apt pour authentifier les paquets. Les paquets authentifiés par ces clés seront réputés fiables. +gère les clés dont se sert apt pour authentifier les paquets\&. Les paquets authentifiés par ces clés seront réputés fiables\&. .SH "COMMANDES" .PP add \fIfichier\fR -.RS 3n -Ajouter une clé à la liste des clés fiables. La clé est lue dans -\fIfichier\fR, ou sur l'entrée standard si +.RS 4 +Ajouter une clé à la liste des clés fiables\&. La clé est lue dans +\fIfichier\fR, ou sur l\'entrée standard si \fIfichier\fR est -\-. +\-\&. .RE .PP del \fIkeyid\fR -.RS 3n -Supprimer une clé de la liste des clés fiables. +.RS 4 +Supprimer une clé de la liste des clés fiables\&. .RE .PP list -.RS 3n -Afficher la liste des clés fiables. +.RS 4 +Afficher la liste des clés fiables\&. .RE .PP update -.RS 3n -Mettre à jour le trousseau de clés local avec le trousseau de clés de l'archive Debian et supprimer les clés qui sont périmées. +.RS 4 +Mettre à jour le trousseau de clés local avec le trousseau de clés de l\'archive Debian et supprimer les clés qui sont périmées\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/trusted.gpg\fR -.RS 3n -Trousseau de clés locales fiables, les nouvelles clés sont ajoutées ici. +\fI/etc/apt/trusted\&.gpg\fR +.RS 4 +Trousseau de clés locales fiables, les nouvelles clés sont ajoutées ici\&. .RE .PP -\fI/etc/apt/trustdb.gpg\fR -.RS 3n -Base de données locale fiable des clés de l'archive. +\fI/etc/apt/trustdb\&.gpg\fR +.RS 4 +Base de données locale fiable des clés de l\'archive\&. .RE .PP -\fI/usr/share/keyrings/debian\-archive\-keyring.gpg\fR -.RS 3n -Trousseau des clés fiables de l'archive Debian. +\fI/usr/share/keyrings/debian\-archive\-keyring\&.gpg\fR +.RS 4 +Trousseau des clés fiables de l\'archive Debian\&. .RE .PP -\fI/usr/share/keyrings/debian\-archive\-removed\-keys.gpg\fR -.RS 3n -Trousseau des clés fiables supprimées de l'archive Debian. +\fI/usr/share/keyrings/debian\-archive\-removed\-keys\&.gpg\fR +.RS 4 +Trousseau des clés fiables supprimées de l\'archive Debian\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-get\fR(8), -\fBapt\-secure\fR(8) +\fBapt-get\fR(8), +\fBapt-secure\fR(8) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "AUTEUR" .PP -APT a été écrit par l'équipe APT -. +APT a été écrit par l\'équipe APT +\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-key.fr.8 b/doc/fr/apt-key.fr.8 index b5a867a..9e42167 100644 --- a/doc/fr/apt-key.fr.8 +++ b/doc/fr/apt-key.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-key +.\" Title: apt-key .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 décembre 2003 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-key \- Utilitaire de gestion des clés +apt-key \- Utilitaire de gestion des clés .SH "SYNOPSIS" .HP 8 \fBapt\-key\fR [\fIcommand\fR/] [\fB\fIarguments\fR\fR...] @@ -19,83 +19,85 @@ apt\-key \- Utilitaire de gestion des cl .PP \fBapt\-key\fR -gère les clés dont se sert apt pour authentifier les paquets. Les paquets authentifiés par ces clés seront réputés fiables. +gère les clés dont se sert apt pour authentifier les paquets\&. Les paquets authentifiés par ces clés seront réputés fiables\&. .SH "COMMANDES" .PP add \fIfichier\fR -.RS 3n -Ajouter une clé à la liste des clés fiables. La clé est lue dans -\fIfichier\fR, ou sur l'entrée standard si +.RS 4 +Ajouter une clé à la liste des clés fiables\&. La clé est lue dans +\fIfichier\fR, ou sur l\'entrée standard si \fIfichier\fR est -\-. +\-\&. .RE .PP del \fIkeyid\fR -.RS 3n -Supprimer une clé de la liste des clés fiables. +.RS 4 +Supprimer une clé de la liste des clés fiables\&. .RE .PP list -.RS 3n -Afficher la liste des clés fiables. +.RS 4 +Afficher la liste des clés fiables\&. .RE .PP update -.RS 3n -Mettre à jour le trousseau de clés local avec le trousseau de clés de l'archive Debian et supprimer les clés qui sont périmées. +.RS 4 +Mettre à jour le trousseau de clés local avec le trousseau de clés de l\'archive Debian et supprimer les clés qui sont périmées\&. .RE .SH "FICHIERS" .PP -\fI/etc/apt/trusted.gpg\fR -.RS 3n -Trousseau de clés locales fiables, les nouvelles clés sont ajoutées ici. +\fI/etc/apt/trusted\&.gpg\fR +.RS 4 +Trousseau de clés locales fiables, les nouvelles clés sont ajoutées ici\&. .RE .PP -\fI/etc/apt/trustdb.gpg\fR -.RS 3n -Base de données locale fiable des clés de l'archive. +\fI/etc/apt/trustdb\&.gpg\fR +.RS 4 +Base de données locale fiable des clés de l\'archive\&. .RE .PP -\fI/usr/share/keyrings/debian\-archive\-keyring.gpg\fR -.RS 3n -Trousseau des clés fiables de l'archive Debian. +\fI/usr/share/keyrings/debian\-archive\-keyring\&.gpg\fR +.RS 4 +Trousseau des clés fiables de l\'archive Debian\&. .RE .PP -\fI/usr/share/keyrings/debian\-archive\-removed\-keys.gpg\fR -.RS 3n -Trousseau des clés fiables supprimées de l'archive Debian. +\fI/usr/share/keyrings/debian\-archive\-removed\-keys\&.gpg\fR +.RS 4 +Trousseau des clés fiables supprimées de l\'archive Debian\&. .RE .SH "VOIR AUSSI" .PP -\fBapt\-get\fR(8), -\fBapt\-secure\fR(8) +\fBapt-get\fR(8), +\fBapt-secure\fR(8) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "AUTEUR" .PP -APT a été écrit par l'équipe APT -. +APT a été écrit par l\'équipe APT +\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-secure.8 b/doc/fr/apt-secure.8 index 7c53378..bdb1854 100644 --- a/doc/fr/apt-secure.8 +++ b/doc/fr/apt-secure.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-secure +.\" Title: apt-secure .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 décembre 2003 .\" Manual: .\" Source: Linux @@ -11,130 +11,141 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-secure \- Certification d'archive avec APT +apt-secure \- Certification d'archive avec APT .SH "DESCRIPTION" .PP -Depuis sa version 0.6, +Depuis sa version 0\&.6, \fBapt\fR -sait vérifier la signature du fichier Release de chaque archive. On s'assure ainsi que les paquets de cette archive ne peuvent pas être modifiés par quelqu'un qui ne possède pas la clé de la signature du fichier Release. +sait vérifier la signature du fichier Release de chaque archive\&. On s\'assure ainsi que les paquets de cette archive ne peuvent pas être modifiés par quelqu\'un qui ne possède pas la clé de la signature du fichier Release\&. .PP -Quand un paquet provient d'une archive sans signature ou d'une archive avec une signature dont apt ne possède pas la clé, ce paquet n'est pas considéré comme fiable et son installation provoquera un avertissement. Pour l'instant, +Quand un paquet provient d\'une archive sans signature ou d\'une archive avec une signature dont apt ne possède pas la clé, ce paquet n\'est pas considéré comme fiable et son installation provoquera un avertissement\&. Pour l\'instant, \fBapt\-get\fR -ne signale que les archives sans signature\ ; les prochaines versions pourraient rendre obligatoire la vérification des sources avant tout téléchargement de paquet. +ne signale que les archives sans signature\ \&; les prochaines versions pourraient rendre obligatoire la vérification des sources avant tout téléchargement de paquet\&. .PP Les paquets -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBaptitude\fR(8) et \fBsynaptic\fR(8) -possèdent cette nouvelle fonction de certification. +possèdent cette nouvelle fonction de certification\&. .SH "ARCHIVES FIABLES" .PP -D'une archive apt jusqu'à l'utilisateur, la confiance se construit en plusieurs étapes. +D\'une archive apt jusqu\'à l\'utilisateur, la confiance se construit en plusieurs étapes\&. \fBApt\-secure\fR -est la dernière étape. Faire confiance à une archive ne signifie pas que les paquets qu'elle contient sont exempts de code malveillant, mais signifie que vous faites confiance au responsable de l'archive. C'est ensuite au responsable de l'archive de faire en sorte que l'archive soit fiable. +est la dernière étape\&. Faire confiance à une archive ne signifie pas que les paquets qu\'elle contient sont exempts de code malveillant, mais signifie que vous faites confiance au responsable de l\'archive\&. C\'est ensuite au responsable de l\'archive de faire en sorte que l\'archive soit fiable\&. .PP \fBApt\-secure\fR -n'examine pas la signature d'un paquet. Certains programmes peuvent le faire comme +n\'examine pas la signature d\'un paquet\&. Certains programmes peuvent le faire comme \fBdebsig\-verify\fR ou -\fBdebsign\fR, qu'on peut trouver dans les paquets debsig\-verify et devscripts. +\fBdebsign\fR, qu\'on peut trouver dans les paquets debsig\-verify et devscripts\&. .PP -La fiabilisation dans Debian commence quand un responsable de paquet envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. Cet envoi, pour être effectif, doit être signé avec la clé d'un responsable qui se trouve dans le trousseau des responsables Debian (disponible dans le paquet debian\-keyring). Les clés des responsables de paquet sont signées par d'autres responsables, suivant des procédures préétablies pour s'assurer de l'identité des propriétaires de la clé. +La fiabilisation dans Debian commence quand un responsable de paquet envoie un nouveau paquet ou une nouvelle version d\'un paquet dans l\'archive\&. Cet envoi, pour être effectif, doit être signé avec la clé d\'un responsable qui se trouve dans le trousseau des responsables Debian (disponible dans le paquet debian\-keyring)\&. Les clés des responsables de paquet sont signées par d\'autres responsables, suivant des procédures préétablies pour s\'assurer de l\'identité des propriétaires de la clé\&. .PP -Une fois le paquet vérifié et archivé, la signature du responsable est enlevée, une somme MD5 du paquet est calculée et mise dans le fichier Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette clé qui est créée chaque année et distribuée par le serveur FTP se trouve aussi dans le trousseau Debian. +Une fois le paquet vérifié et archivé, la signature du responsable est enlevée, une somme MD5 du paquet est calculée et mise dans le fichier Packages\&. Une somme MD5 de tous les paquets est ensuite calculée et mise dans le fichier Release\&. Ce fichier est signé par la clé de l\'archive\&. Cette clé qui est créée chaque année et distribuée par le serveur FTP se trouve aussi dans le trousseau Debian\&. .PP -Un utilisateur peut consulter la signature du fichier Release, extraire la somme MD5 d'un paquet et la comparer avec la somme du paquet qu'il a téléchargé. Avant la version 0.6, seule la somme du paquet téléchargé était vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release. +Un utilisateur peut consulter la signature du fichier Release, extraire la somme MD5 d\'un paquet et la comparer avec la somme du paquet qu\'il a téléchargé\&. Avant la version 0\&.6, seule la somme du paquet téléchargé était vérifiée\&. Maintenant on peut vérifier aussi la signature du fichier Release\&. .PP -Cette façon de faire est différente d'une vérification de la signature d'un paquet. Elle vise à empêcher deux types d'attaque possibles\ : -.TP 3n -\(bu -L'attaque de type -\(Fo\ homme au milieu\ \(Fc. Sans vérification de signature, quelqu'un de malveillant peut s'introduire au milieu du processus de téléchargement et insérer du code soit en contrôlant un élément du réseau, routeur, commutateur, etc. soit en détournant le trafic vers un serveur fourbe (par usurpation d'adresses). -.TP 3n -\(bu -L'attaque par compromission d'un miroir sur le réseau. Sans vérification de signature, quelqu'un de malveillant peut compromettre un miroir et modifier les fichiers. Ainsi tous ceux qui téléchargent les paquets de ce miroir propagent du code malveillant. +Cette façon de faire est différente d\'une vérification de la signature d\'un paquet\&. Elle vise à empêcher deux types d\'attaque possibles\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'L\'attaque de type +\(Fo\ \&homme au milieu\ \&\(Fc\&. Sans vérification de signature, quelqu\'un de malveillant peut s\'introduire au milieu du processus de téléchargement et insérer du code soit en contrôlant un élément du réseau, routeur, commutateur, etc\&. soit en détournant le trafic vers un serveur fourbe (par usurpation d\'adresses)\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'L\'attaque par compromission d\'un miroir sur le réseau\&. Sans vérification de signature, quelqu\'un de malveillant peut compromettre un miroir et modifier les fichiers\&. Ainsi tous ceux qui téléchargent les paquets de ce miroir propagent du code malveillant\&. +.RE .PP -Cependant cette méthode ne garantit pas contre une compromission du serveur Debian lui\-même (qui signe les paquets) ni contre la compromission de la clé qui sert à signer les fichiers Release. Mais elle peut compléter la signature des paquets. +Cependant cette méthode ne garantit pas contre une compromission du serveur Debian lui\-même (qui signe les paquets) ni contre la compromission de la clé qui sert à signer les fichiers Release\&. Mais elle peut compléter la signature des paquets\&. .SH "CONFIGURATION" .PP -Le programme qui gère la liste des clés utilisées par apt s'appelle -\fBapt\-key\fR. Il peut ajouter ou supprimer des clés. Cette version installe automatiquement les clés qui servent à signer l'archive Debian et les différents répertoires de paquets. +Le programme qui gère la liste des clés utilisées par apt s\'appelle +\fBapt\-key\fR\&. Il peut ajouter ou supprimer des clés\&. Cette version installe automatiquement les clés qui servent à signer l\'archive Debian et les différents répertoires de paquets\&. .PP -Pour ajouter une clé, vous devez d'abord la télécharger. Il vaut mieux utiliser un canal fiable pour ce téléchargement. Ensuite vous l'ajoutez avec la commande +Pour ajouter une clé, vous devez d\'abord la télécharger\&. Il vaut mieux utiliser un canal fiable pour ce téléchargement\&. Ensuite vous l\'ajoutez avec la commande \fBapt\-key\fR et vous lancez la commande \fBapt\-get update\fR pour télécharger et vérifier le fichier -\fIRelease.gpg\fR -de l'archive que vous avez configurée. +\fIRelease\&.gpg\fR +de l\'archive que vous avez configurée\&. .SH "CONFIGURATION D'UNE ARCHIVE" .PP -Si vous voulez signer les archives dont vous avez la responsabilité, vous devez\ : -.TP 3n -\(bu -créer un fichier Release à la racine de l'archive, s'il n'existe pas déjà. Vous pouvez le créer avec la commande +Si vous voulez signer les archives dont vous avez la responsabilité, vous devez\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'créer un fichier Release à la racine de l\'archive, s\'il n\'existe pas déjà\&. Vous pouvez le créer avec la commande \fBapt\-ftparchive release\fR -(fournie dans le paquet apt\-utils)\ ; -.TP 3n -\(bu -le signer, avec la commande -\fBgpg \-abs \-o Release.gpg Release\fR\ ; -.TP 3n -\(bu -publier l'empreinte de la clé. Ainsi les utilisateurs de votre archive connaîtront la clé qu'ils doivent importer pour authentifier les fichiers de l'archive. -.PP -Chaque fois que le contenu de l'archive change, le responsable doit refaire les deux premières étapes. +(fournie dans le paquet apt\-utils)\ \&; +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'le signer, avec la commande +\fBgpg \-abs \-o Release\&.gpg Release\fR\ \&; +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'publier l\'empreinte de la clé\&. Ainsi les utilisateurs de votre archive connaîtront la clé qu\'ils doivent importer pour authentifier les fichiers de l\'archive\&. +.RE +.PP +Chaque fois que le contenu de l\'archive change, le responsable doit refaire les deux premières étapes\&. .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8),\fBsources.list\fR(5), -\fBapt\-key\fR(8), -\fBapt\-archive\fR(1), +\fBapt-get\fR(8),\fBsources.list\fR(5), +\fBapt-key\fR(8), +\fBapt-ftparchive\fR(1), \fBdebsign\fR(1), -\fBdebsig\-verify\fR(1), +\fBdebsig-verify\fR(1), \fBgpg\fR(1) .PP Pour des informations plus substantielles, vous pouvez consulter -[1]\&\fI l'infrastructure debian pour la sécurité\fR +\fI l\'infrastructure debian pour la sécurité\fR\&[1] un chapitre du manuel Debian sur la sécurité (disponible dans le paquet harden\-doc) et le -[2]\&\fIStrong Distribution HOWTO\fR -par V. Alex Brennen. +\fIStrong Distribution HOWTO\fR\&[2] +par V\&. Alex Brennen\&. .SH "BOGUES" .PP Voyez la -[3]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[3]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "AUTEUR" .PP -APT a été écrit par l'équipe APT -. +APT a été écrit par l\'équipe APT +\&. .SH "AUTEURS" .PP -Cette page a été écrite à partir des travaux de Javier Fernández\-Sanguino Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt. +Cette page a été écrite à partir des travaux de Javier Fernández\-Sanguino Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ l'infrastructure debian pour la sécurité -\%http://www.debian.org/doc/manuals/securing\-debian\-howto/ch7.en.html -.TP 3 -2.\ Strong Distribution HOWTO +.SH "NOTES" +.IP " 1." 4 +l'infrastructure debian pour la sécurité +.RS 4 +\%http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html +.RE +.IP " 2." 4 +Strong Distribution HOWTO +.RS 4 \%http://www.cryptnet.net/fdp/crypto/strong_distro.html -.TP 3 -3.\ page concernant les bogues d'APT +.RE +.IP " 3." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-secure.fr.8 b/doc/fr/apt-secure.fr.8 index 7c53378..bdb1854 100644 --- a/doc/fr/apt-secure.fr.8 +++ b/doc/fr/apt-secure.fr.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-secure +.\" Title: apt-secure .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 décembre 2003 .\" Manual: .\" Source: Linux @@ -11,130 +11,141 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-secure \- Certification d'archive avec APT +apt-secure \- Certification d'archive avec APT .SH "DESCRIPTION" .PP -Depuis sa version 0.6, +Depuis sa version 0\&.6, \fBapt\fR -sait vérifier la signature du fichier Release de chaque archive. On s'assure ainsi que les paquets de cette archive ne peuvent pas être modifiés par quelqu'un qui ne possède pas la clé de la signature du fichier Release. +sait vérifier la signature du fichier Release de chaque archive\&. On s\'assure ainsi que les paquets de cette archive ne peuvent pas être modifiés par quelqu\'un qui ne possède pas la clé de la signature du fichier Release\&. .PP -Quand un paquet provient d'une archive sans signature ou d'une archive avec une signature dont apt ne possède pas la clé, ce paquet n'est pas considéré comme fiable et son installation provoquera un avertissement. Pour l'instant, +Quand un paquet provient d\'une archive sans signature ou d\'une archive avec une signature dont apt ne possède pas la clé, ce paquet n\'est pas considéré comme fiable et son installation provoquera un avertissement\&. Pour l\'instant, \fBapt\-get\fR -ne signale que les archives sans signature\ ; les prochaines versions pourraient rendre obligatoire la vérification des sources avant tout téléchargement de paquet. +ne signale que les archives sans signature\ \&; les prochaines versions pourraient rendre obligatoire la vérification des sources avant tout téléchargement de paquet\&. .PP Les paquets -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBaptitude\fR(8) et \fBsynaptic\fR(8) -possèdent cette nouvelle fonction de certification. +possèdent cette nouvelle fonction de certification\&. .SH "ARCHIVES FIABLES" .PP -D'une archive apt jusqu'à l'utilisateur, la confiance se construit en plusieurs étapes. +D\'une archive apt jusqu\'à l\'utilisateur, la confiance se construit en plusieurs étapes\&. \fBApt\-secure\fR -est la dernière étape. Faire confiance à une archive ne signifie pas que les paquets qu'elle contient sont exempts de code malveillant, mais signifie que vous faites confiance au responsable de l'archive. C'est ensuite au responsable de l'archive de faire en sorte que l'archive soit fiable. +est la dernière étape\&. Faire confiance à une archive ne signifie pas que les paquets qu\'elle contient sont exempts de code malveillant, mais signifie que vous faites confiance au responsable de l\'archive\&. C\'est ensuite au responsable de l\'archive de faire en sorte que l\'archive soit fiable\&. .PP \fBApt\-secure\fR -n'examine pas la signature d'un paquet. Certains programmes peuvent le faire comme +n\'examine pas la signature d\'un paquet\&. Certains programmes peuvent le faire comme \fBdebsig\-verify\fR ou -\fBdebsign\fR, qu'on peut trouver dans les paquets debsig\-verify et devscripts. +\fBdebsign\fR, qu\'on peut trouver dans les paquets debsig\-verify et devscripts\&. .PP -La fiabilisation dans Debian commence quand un responsable de paquet envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. Cet envoi, pour être effectif, doit être signé avec la clé d'un responsable qui se trouve dans le trousseau des responsables Debian (disponible dans le paquet debian\-keyring). Les clés des responsables de paquet sont signées par d'autres responsables, suivant des procédures préétablies pour s'assurer de l'identité des propriétaires de la clé. +La fiabilisation dans Debian commence quand un responsable de paquet envoie un nouveau paquet ou une nouvelle version d\'un paquet dans l\'archive\&. Cet envoi, pour être effectif, doit être signé avec la clé d\'un responsable qui se trouve dans le trousseau des responsables Debian (disponible dans le paquet debian\-keyring)\&. Les clés des responsables de paquet sont signées par d\'autres responsables, suivant des procédures préétablies pour s\'assurer de l\'identité des propriétaires de la clé\&. .PP -Une fois le paquet vérifié et archivé, la signature du responsable est enlevée, une somme MD5 du paquet est calculée et mise dans le fichier Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette clé qui est créée chaque année et distribuée par le serveur FTP se trouve aussi dans le trousseau Debian. +Une fois le paquet vérifié et archivé, la signature du responsable est enlevée, une somme MD5 du paquet est calculée et mise dans le fichier Packages\&. Une somme MD5 de tous les paquets est ensuite calculée et mise dans le fichier Release\&. Ce fichier est signé par la clé de l\'archive\&. Cette clé qui est créée chaque année et distribuée par le serveur FTP se trouve aussi dans le trousseau Debian\&. .PP -Un utilisateur peut consulter la signature du fichier Release, extraire la somme MD5 d'un paquet et la comparer avec la somme du paquet qu'il a téléchargé. Avant la version 0.6, seule la somme du paquet téléchargé était vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release. +Un utilisateur peut consulter la signature du fichier Release, extraire la somme MD5 d\'un paquet et la comparer avec la somme du paquet qu\'il a téléchargé\&. Avant la version 0\&.6, seule la somme du paquet téléchargé était vérifiée\&. Maintenant on peut vérifier aussi la signature du fichier Release\&. .PP -Cette façon de faire est différente d'une vérification de la signature d'un paquet. Elle vise à empêcher deux types d'attaque possibles\ : -.TP 3n -\(bu -L'attaque de type -\(Fo\ homme au milieu\ \(Fc. Sans vérification de signature, quelqu'un de malveillant peut s'introduire au milieu du processus de téléchargement et insérer du code soit en contrôlant un élément du réseau, routeur, commutateur, etc. soit en détournant le trafic vers un serveur fourbe (par usurpation d'adresses). -.TP 3n -\(bu -L'attaque par compromission d'un miroir sur le réseau. Sans vérification de signature, quelqu'un de malveillant peut compromettre un miroir et modifier les fichiers. Ainsi tous ceux qui téléchargent les paquets de ce miroir propagent du code malveillant. +Cette façon de faire est différente d\'une vérification de la signature d\'un paquet\&. Elle vise à empêcher deux types d\'attaque possibles\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'L\'attaque de type +\(Fo\ \&homme au milieu\ \&\(Fc\&. Sans vérification de signature, quelqu\'un de malveillant peut s\'introduire au milieu du processus de téléchargement et insérer du code soit en contrôlant un élément du réseau, routeur, commutateur, etc\&. soit en détournant le trafic vers un serveur fourbe (par usurpation d\'adresses)\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'L\'attaque par compromission d\'un miroir sur le réseau\&. Sans vérification de signature, quelqu\'un de malveillant peut compromettre un miroir et modifier les fichiers\&. Ainsi tous ceux qui téléchargent les paquets de ce miroir propagent du code malveillant\&. +.RE .PP -Cependant cette méthode ne garantit pas contre une compromission du serveur Debian lui\-même (qui signe les paquets) ni contre la compromission de la clé qui sert à signer les fichiers Release. Mais elle peut compléter la signature des paquets. +Cependant cette méthode ne garantit pas contre une compromission du serveur Debian lui\-même (qui signe les paquets) ni contre la compromission de la clé qui sert à signer les fichiers Release\&. Mais elle peut compléter la signature des paquets\&. .SH "CONFIGURATION" .PP -Le programme qui gère la liste des clés utilisées par apt s'appelle -\fBapt\-key\fR. Il peut ajouter ou supprimer des clés. Cette version installe automatiquement les clés qui servent à signer l'archive Debian et les différents répertoires de paquets. +Le programme qui gère la liste des clés utilisées par apt s\'appelle +\fBapt\-key\fR\&. Il peut ajouter ou supprimer des clés\&. Cette version installe automatiquement les clés qui servent à signer l\'archive Debian et les différents répertoires de paquets\&. .PP -Pour ajouter une clé, vous devez d'abord la télécharger. Il vaut mieux utiliser un canal fiable pour ce téléchargement. Ensuite vous l'ajoutez avec la commande +Pour ajouter une clé, vous devez d\'abord la télécharger\&. Il vaut mieux utiliser un canal fiable pour ce téléchargement\&. Ensuite vous l\'ajoutez avec la commande \fBapt\-key\fR et vous lancez la commande \fBapt\-get update\fR pour télécharger et vérifier le fichier -\fIRelease.gpg\fR -de l'archive que vous avez configurée. +\fIRelease\&.gpg\fR +de l\'archive que vous avez configurée\&. .SH "CONFIGURATION D'UNE ARCHIVE" .PP -Si vous voulez signer les archives dont vous avez la responsabilité, vous devez\ : -.TP 3n -\(bu -créer un fichier Release à la racine de l'archive, s'il n'existe pas déjà. Vous pouvez le créer avec la commande +Si vous voulez signer les archives dont vous avez la responsabilité, vous devez\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'créer un fichier Release à la racine de l\'archive, s\'il n\'existe pas déjà\&. Vous pouvez le créer avec la commande \fBapt\-ftparchive release\fR -(fournie dans le paquet apt\-utils)\ ; -.TP 3n -\(bu -le signer, avec la commande -\fBgpg \-abs \-o Release.gpg Release\fR\ ; -.TP 3n -\(bu -publier l'empreinte de la clé. Ainsi les utilisateurs de votre archive connaîtront la clé qu'ils doivent importer pour authentifier les fichiers de l'archive. -.PP -Chaque fois que le contenu de l'archive change, le responsable doit refaire les deux premières étapes. +(fournie dans le paquet apt\-utils)\ \&; +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'le signer, avec la commande +\fBgpg \-abs \-o Release\&.gpg Release\fR\ \&; +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'publier l\'empreinte de la clé\&. Ainsi les utilisateurs de votre archive connaîtront la clé qu\'ils doivent importer pour authentifier les fichiers de l\'archive\&. +.RE +.PP +Chaque fois que le contenu de l\'archive change, le responsable doit refaire les deux premières étapes\&. .SH "VOIR AUSSI" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8),\fBsources.list\fR(5), -\fBapt\-key\fR(8), -\fBapt\-archive\fR(1), +\fBapt-get\fR(8),\fBsources.list\fR(5), +\fBapt-key\fR(8), +\fBapt-ftparchive\fR(1), \fBdebsign\fR(1), -\fBdebsig\-verify\fR(1), +\fBdebsig-verify\fR(1), \fBgpg\fR(1) .PP Pour des informations plus substantielles, vous pouvez consulter -[1]\&\fI l'infrastructure debian pour la sécurité\fR +\fI l\'infrastructure debian pour la sécurité\fR\&[1] un chapitre du manuel Debian sur la sécurité (disponible dans le paquet harden\-doc) et le -[2]\&\fIStrong Distribution HOWTO\fR -par V. Alex Brennen. +\fIStrong Distribution HOWTO\fR\&[2] +par V\&. Alex Brennen\&. .SH "BOGUES" .PP Voyez la -[3]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[3]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "AUTEUR" .PP -APT a été écrit par l'équipe APT -. +APT a été écrit par l\'équipe APT +\&. .SH "AUTEURS" .PP -Cette page a été écrite à partir des travaux de Javier Fernández\-Sanguino Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt. +Cette page a été écrite à partir des travaux de Javier Fernández\-Sanguino Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ l'infrastructure debian pour la sécurité -\%http://www.debian.org/doc/manuals/securing\-debian\-howto/ch7.en.html -.TP 3 -2.\ Strong Distribution HOWTO +.SH "NOTES" +.IP " 1." 4 +l'infrastructure debian pour la sécurité +.RS 4 +\%http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html +.RE +.IP " 2." 4 +Strong Distribution HOWTO +.RS 4 \%http://www.cryptnet.net/fdp/crypto/strong_distro.html -.TP 3 -3.\ page concernant les bogues d'APT +.RE +.IP " 3." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml index 5cec9a4..25b5ffd 100644 --- a/doc/fr/apt-secure.fr.8.xml +++ b/doc/fr/apt-secure.fr.8.xml @@ -188,7 +188,7 @@ les deux premi Voir aussi -&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, +&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, &debsig-verify;, &gpg; diff --git a/doc/fr/apt-sortpkgs.1 b/doc/fr/apt-sortpkgs.1 index df7a044..b2457c3 100644 --- a/doc/fr/apt-sortpkgs.1 +++ b/doc/fr/apt-sortpkgs.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-sortpkgs +.\" Title: apt-sortpkgs .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-sortpkgs \- Un outil pour trier les index de paquets. +apt-sortpkgs \- Un outil pour trier les index de paquets. .SH "SYNOPSIS" .HP 13 \fBapt\-sortpkgs\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] \fIfichier\fR... @@ -19,43 +19,43 @@ apt\-sortpkgs \- Un outil pour trier les index de paquets. .PP \fBApt\-sortpkgs\fR -prend un index (un index de Source ou un index de paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des champs de chaque enregistrement est réalisé selon des règles internes. +prend un index (un index de Source ou un index de paquet) et trie leurs enregistrements selon le nom de paquet\&. Un tri des champs de chaque enregistrement est réalisé selon des règles internes\&. .PP -Le résultat est envoyé sur la sortie standard\ ; l'entrée doit être un fichier analysable. +Le résultat est envoyé sur la sortie standard\ \&; l\'entrée doit être un fichier analysable\&. .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-s\fR, \fB\-\-source\fR -.RS 3n -Se servir d'un index de sources pour le tri des champs. Élément de configuration\ : -APT::SortPkgs::Source. +.RS 4 +Se servir d\'un index de sources pour le tri des champs\&. Élément de configuration\ \&: +APT::SortPkgs::Source\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -65,30 +65,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .PP \fBapt\-sortpkgs\fR -retourne zéro si tout se passe bien ou 100 en cas d'erreur. +retourne zéro si tout se passe bien ou 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt-sortpkgs.fr.1 b/doc/fr/apt-sortpkgs.fr.1 index df7a044..b2457c3 100644 --- a/doc/fr/apt-sortpkgs.fr.1 +++ b/doc/fr/apt-sortpkgs.fr.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-sortpkgs +.\" Title: apt-sortpkgs .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NOM" -apt\-sortpkgs \- Un outil pour trier les index de paquets. +apt-sortpkgs \- Un outil pour trier les index de paquets. .SH "SYNOPSIS" .HP 13 \fBapt\-sortpkgs\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIoption\ de\ configuration\fR\fR] [\fB\-c=\fR\fB\fIfichier\fR\fR] \fIfichier\fR... @@ -19,43 +19,43 @@ apt\-sortpkgs \- Un outil pour trier les index de paquets. .PP \fBApt\-sortpkgs\fR -prend un index (un index de Source ou un index de paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des champs de chaque enregistrement est réalisé selon des règles internes. +prend un index (un index de Source ou un index de paquet) et trie leurs enregistrements selon le nom de paquet\&. Un tri des champs de chaque enregistrement est réalisé selon des règles internes\&. .PP -Le résultat est envoyé sur la sortie standard\ ; l'entrée doit être un fichier analysable. +Le résultat est envoyé sur la sortie standard\ \&; l\'entrée doit être un fichier analysable\&. .SH "OPTIONS" .PP -Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ ; les descriptifs indiquent l'option de configuration à positionner. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme +Toutes les options en ligne de commande peuvent être positionnées via le fichier de configuration\ \&; les descriptifs indiquent l\'option de configuration à positionner\&. En ce qui concerne les options booléennes, on peut annuler le fichier de configuration en utilisant quelque chose comme \fB\-f\-\fR,\fB\-\-no\-f\fR, \fB\-f=no\fR -ou d'autres variantes. +ou d\'autres variantes\&. .PP \fB\-s\fR, \fB\-\-source\fR -.RS 3n -Se servir d'un index de sources pour le tri des champs. Élément de configuration\ : -APT::SortPkgs::Source. +.RS 4 +Se servir d\'un index de sources pour le tri des champs\&. Élément de configuration\ \&: +APT::SortPkgs::Source\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n -Affiche un mode d'emploi succinct. +.RS 4 +Affiche un mode d\'emploi succinct\&. .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n -Affiche la version du programme. +.RS 4 +Affiche la version du programme\&. .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n -Fichier de configuration\ ; indique quel fichier de configuration utiliser. Le programme lit le fichier de configuration par défaut, puis celui\-ci. Voyez +.RS 4 +Fichier de configuration\ \&; indique quel fichier de configuration utiliser\&. Le programme lit le fichier de configuration par défaut, puis celui\-ci\&. Voyez \fBapt.conf\fR(5) -pour la syntaxe. +pour la syntaxe\&. .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n -Donne une option de configuration\ ; cela fixe une option de configuration arbitraire. La syntaxe est : -\fB\-o Foo::Bar=bar\fR. +.RS 4 +Donne une option de configuration\ \&; cela fixe une option de configuration arbitraire\&. La syntaxe est : +\fB\-o Foo::Bar=bar\fR\&. .RE .SH "VOIR AUSSI" .PP @@ -65,30 +65,32 @@ Donne une option de configuration\ ; cela fixe une option de configuration arbit .PP \fBapt\-sortpkgs\fR -retourne zéro si tout se passe bien ou 100 en cas d'erreur. +retourne zéro si tout se passe bien ou 100 en cas d\'erreur\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt.conf.5 b/doc/fr/apt.conf.5 index 804c834..44a88a7 100644 --- a/doc/fr/apt.conf.5 +++ b/doc/fr/apt.conf.5 @@ -1,11 +1,11 @@ .\" Title: apt.conf .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT.CONF" "5" "29 Février 2004" "Linux" "" +.TH "APT\&.CONF" "5" "29 Février 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,24 +15,24 @@ apt.conf \- Fichier de configuration pour APT .SH "DESCRIPTION" .PP Le fichier -\fIapt.conf\fR -est le principal fichier de configuration de la collection d'outils que constitue APT\ ; tous les outils font appel à ce fichier de configuration et utilisent un analyseur syntaxique en ligne de commande commun afin de fournir un environnement uniforme. Quand un outil d'APT démarre, il lit (si elle existe) la variable d'environnement -\fBAPT_CONFIG\fR\ ; puis il lit les fichiers situés dans +\fIapt\&.conf\fR +est le principal fichier de configuration de la collection d\'outils que constitue APT\ \&; tous les outils font appel à ce fichier de configuration et utilisent un analyseur syntaxique en ligne de commande commun afin de fournir un environnement uniforme\&. Quand un outil d\'APT démarre, il lit (si elle existe) la variable d\'environnement +\fBAPT_CONFIG\fR\ \&; puis il lit les fichiers situés 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 nécessaire, d'autres fichiers de configuration. +Dir::Etc::main\ \&; enfin il applique les options de la ligne de commande qui annulent les directives de configuration, chargeant, si nécessaire, d\'autres fichiers de configuration\&. .PP -Le fichier de configuration est construit comme un arbre d'options organisées en groupes fonctionnels. On se sert du double deux points (\(Fo\ ::\ \(Fc) pour indiquer une option\ ; par exemple, +Le fichier de configuration est construit comme un arbre d\'options organisées en groupes fonctionnels\&. On se sert du double deux points (\(Fo\ \&::\ \&\(Fc) pour indiquer une option\ \&; par exemple, APT::Get::Assume\-Yes -est une option pour le groupe d'outils APT, destinée à l'outil Get. Les options n'héritent pas des groupes de leurs parents. +est une option pour le groupe d\'outils APT, destinée à l\'outil Get\&. Les options n\'héritent pas des groupes de leurs parents\&. .PP -Syntaxiquement, le langage de configuration est conçu sur le même modèle que les langages utilisés par des outils ISC tels que bind et dhcp. Une ligne qui commence par +Syntaxiquement, le langage de configuration est conçu sur le même modèle que les langages utilisés par des outils ISC tels que bind et dhcp\&. Une ligne qui commence par // -est un commentaire et elle est ignorée. Chaque ligne est de la forme\ : +est un commentaire et elle est ignorée\&. Chaque ligne est de la forme\ \&: APT::Get::Assume\-Yes "true"; -Le point\-virgule final est obligatoire et les guillemets sont optionnels. On peut déclarer un nouveau champ d'action avec des accolades, comme suit\ : +Le point\-virgule final est obligatoire et les guillemets sont optionnels\&. On peut déclarer un nouveau champ d\'action avec des accolades, comme suit\ \&: .sp -.RS 3n +.RS 4 .nf APT { @@ -44,9 +44,9 @@ APT { .fi .RE .PP -avec des retours à la ligne pour faciliter la lecture. On peut créer 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 entrées, séparées par un point\-virgule. +avec des retours à la ligne pour faciliter la lecture\&. On peut créer 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 entrées, séparées par un point\-virgule\&. .sp -.RS 3n +.RS 4 .nf DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; @@ -54,246 +54,246 @@ DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; .RE .PP Les modèles -\fI/usr/share/doc/apt/examples/apt.conf\fR -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -montrent à quoi devrait ressembler le fichier de configuration. +\fI/usr/share/doc/apt/examples/apt\&.conf\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +montrent à quoi devrait ressembler le fichier de configuration\&. .PP -Deux éléments spéciaux sont autorisés\ : +Deux éléments spéciaux sont autorisés\ \&: #include et -#clear. +#clear\&. #include -inclut le fichier donné en argument, à moins que le nom ne se termine par une barre oblique. +inclut le fichier donné en argument, à moins que le nom ne se termine par une barre oblique\&. #clear -sert à effacer une liste de noms. +sert à effacer une liste de noms\&. .PP -Tous les outils d'APT possèdent une option +Tous les outils d\'APT possèdent une option \fB\-o\fR -qui permet de spécifier une configuration arbitraire depuis la ligne de commande. La syntaxe consiste en un nom complet d'option (par exemple -APT::Get::Assume\-Yes) suivi par un signe égal, puis par la nouvelle valeur de l'option. On peut compléter une liste en ajoutant un \(Fo\ ::\ \(Fc au nom de la liste. +qui permet de spécifier une configuration arbitraire depuis la ligne de commande\&. La syntaxe consiste en un nom complet d\'option (par exemple +APT::Get::Assume\-Yes) suivi par un signe égal, puis par la nouvelle valeur de l\'option\&. On peut compléter une liste en ajoutant un \(Fo\ \&::\ \&\(Fc au nom de la liste\&. .SH "LE GROUPE APT" .PP -Ce groupe d'options contrôle aussi bien le comportement global d'APT que la prise en compte des options pour chaque outil. +Ce groupe d\'options contrôle aussi bien le comportement global d\'APT que la prise en compte des options pour chaque outil\&. .PP Architecture -.RS 3n -L'architecture du système\ ; cette option positionne l'architecture à utiliser pour récupérer des fichiers et analyser des listes de paquets. L'architecture interne par défaut est celle pour laquelle APT a été compilé. +.RS 4 +L\'architecture du système\ \&; cette option positionne l\'architecture à utiliser pour récupérer des fichiers et analyser des listes de paquets\&. L\'architecture interne par défaut est celle pour laquelle APT a été compilé\&. .RE .PP Ignore\-Hold -.RS 3n -Ignore les paquets \(Fo\ gelés\ \(Fc\ ; cette option globale indique au système de résolution de ne pas tenir compte des paquets \(Fo\ gelés\ \(Fc dans sa prise de décision. +.RS 4 +Ignore les paquets \(Fo\ \&gelés\ \&\(Fc\ \&; cette option globale indique au système de résolution de ne pas tenir compte des paquets \(Fo\ \&gelés\ \&\(Fc dans sa prise de décision\&. .RE .PP Clean\-Installed -.RS 3n -Avec cette option qui est activée par défaut, la fonctionnalité \(Fo\ autoclean\ \(Fc supprime tout paquet qui ne peut plus être récupéré dans le cache. Quand cette option est désactivée, les paquets qui sont installés localement sont aussi exclus du nettoyage \- mais notez que APT ne fournit aucun moyen direct pour les réinstaller. +.RS 4 +Avec cette option qui est activée par défaut, la fonctionnalité \(Fo\ \&autoclean\ \&\(Fc supprime tout paquet qui ne peut plus être récupéré dans le cache\&. Quand cette option est désactivée, les paquets qui sont installés localement sont aussi exclus du nettoyage \- mais notez que APT ne fournit aucun moyen direct pour les réinstaller\&. .RE .PP Immediate\-Configure -.RS 3n -Désactive la configuration immédiate\ ; cette dangereuse option désactive une partie du code de mise en ordre de APT pour que ce dernier effectue le moins d'appels possible à Dpkg. C'est peut\-être nécessaire sur des systèmes lents à un seul utilisateur mais c'est extrêmement dangereux et cela peut faire échouer les scripts d'installation, voire pire. Utilisez\-la à vos risques et périls. +.RS 4 +Désactive la configuration immédiate\ \&; cette dangereuse option désactive une partie du code de mise en ordre de APT pour que ce dernier effectue le moins d\'appels possible à Dpkg\&. C\'est peut\-être nécessaire sur des systèmes lents à un seul utilisateur mais c\'est extrêmement dangereux et cela peut faire échouer les scripts d\'installation, voire pire\&. Utilisez\-la à vos risques et périls\&. .RE .PP Force\-LoopBreak -.RS 3n -Ne jamais activer cette option à moins que vous ne sachiez \- réellement \- ce que vous faites. Elle autorise APT à supprimer temporairement un paquet essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / Pre\-Depends entre deux paquets essentiels. UNE TELLE BOUCLE NE DOIT JAMAIS SE PRODUIRE\ : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont ces paquets dépendent. +.RS 4 +Ne jamais activer cette option à moins que vous ne sachiez \- réellement \- ce que vous faites\&. Elle autorise APT à supprimer temporairement un paquet essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / Pre\-Depends entre deux paquets essentiels\&. UNE TELLE BOUCLE NE DOIT JAMAIS SE PRODUIRE\ \&: C\'EST UN BOGUE SÉRIEUX\&. Cette option fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont ces paquets dépendent\&. .RE .PP Cache\-Limit -.RS 3n -APT utilise un fichier cache d'une taille mémoire fixe pour ranger les informations du fichier \(Fo\ available\ \(Fc. Cette option fixe la taille de ce cache. +.RS 4 +APT utilise un fichier cache d\'une taille mémoire fixe pour ranger les informations du fichier \(Fo\ \&available\ \&\(Fc\&. Cette option fixe la taille de ce cache\&. .RE .PP Build\-Essential -.RS 3n -Cette option définit les paquets qui sont considérés comme faisant partie des dépendances essentielles pour la construction des paquets. +.RS 4 +Cette option définit les paquets qui sont considérés comme faisant partie des dépendances essentielles pour la construction des paquets\&. .RE .PP Get -.RS 3n +.RS 4 La sous\-section Get -contrôle l'outil -\fBapt\-get\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil +\fBapt-get\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .PP Cache -.RS 3n +.RS 4 La sous\-section Cache -contrôle l'outil -\fBapt\-cache\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil +\fBapt-cache\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .PP CDROM -.RS 3n +.RS 4 La sous\-section CDROM -contrôle l'outil\fBapt\-cdrom\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil\fBapt-cdrom\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .SH "LE GROUPE ACQUIRE" .PP -Le groupe d'options +Le groupe d\'options Acquire -contrôle le téléchargement des paquets et les gestionnaires d'URI. +contrôle le téléchargement des paquets et les gestionnaires d\'URI\&. .PP Queue\-Mode -.RS 3n -Le mode file d'attente\ ; +.RS 4 +Le mode file d\'attente\ \&; Queue\-Mode peut prendre une valeur parmi host ou access -et cela détermine comment APT parallélise les connexions sortantes. +et cela détermine comment APT parallélise les connexions sortantes\&. Host -signifie qu'une connexion par cible sera initiée, tandis que +signifie qu\'une connexion par cible sera initiée, tandis que access -signifie qu'une connexion par type d'URI sera initiée. +signifie qu\'une connexion par type d\'URI sera initiée\&. .RE .PP Retries -.RS 3n -Nombre d'essais à effectuer. Si ce nombre n'est pas nul, APT essaie de récupérer, le nombre donné de fois, les fichiers dont la récupération a échoué. +.RS 4 +Nombre d\'essais à effectuer\&. Si ce nombre n\'est pas nul, APT essaie de récupérer, le nombre donné de fois, les fichiers dont la récupération a échoué\&. .RE .PP Source\-Symlinks -.RS 3n -Utilise des liens symboliques pour les archives de sources. Positionnée à \(Fo\ true\ \(Fc, cette option crée si possible des liens symboliques vers les archives de sources au lieu de les copier. Par défaut à \(Fo\ true\ \(Fc. +.RS 4 +Utilise des liens symboliques pour les archives de sources\&. Positionnée à \(Fo\ \&true\ \&\(Fc, cette option crée si possible des liens symboliques vers les archives de sources au lieu de les copier\&. Par défaut à \(Fo\ \&true\ \&\(Fc\&. .RE .PP http -.RS 3n -URI HTTP ; http::Proxy est le mandataire (proxy) http à utiliser par défaut. Il se présente sous la forme standard\ : -http://[[user][:pass]@]host[:port]/. En utilisant la syntaxe\ : +.RS 4 +URI HTTP ; http::Proxy est le mandataire (proxy) http à utiliser par défaut\&. Il se présente sous la forme standard\ \&: +http://[[user][:pass]@]host[:port]/\&. En utilisant la syntaxe\ \&: http::Proxy::, où le mot\-clé spécial DIRECT -indique de n'utiliser aucun mandataire, on peut spécifier un mandataire pour chaque machine distante. La variable d'environnement +indique de n\'utiliser aucun mandataire, on peut spécifier un mandataire pour chaque machine distante\&. La variable d\'environnement \fBhttp_proxy\fR -remplace tous ces paramètres. +remplace tous ces paramètres\&. .sp -Trois options de configuration sont fournies pour le contrôle des caches qui sont compatibles avec HTTP/1.1. +Trois options de configuration sont fournies pour le contrôle des caches qui sont compatibles avec HTTP/1\&.1\&. No\-Cache -signifie que le mandataire ne doit pas du tout utiliser les réponses qu'il a stockées\ ; +signifie que le mandataire ne doit pas du tout utiliser les réponses qu\'il a stockées\ \&; Max\-Age -sert uniquement pour les fichiers d'index\ : cela demande au cache de les mettre à jour quand leur ancienneté est supérieure au nombre de secondes donné. Debian met à jour son fichier d'index de manière journalière, la valeur par défaut est donc de 1 jour. +sert uniquement pour les fichiers d\'index\ \&: cela demande au cache de les mettre à jour quand leur ancienneté est supérieure au nombre de secondes donné\&. Debian met à jour son fichier d\'index de manière journalière, la valeur par défaut est donc de 1 jour\&. No\-Store -sert uniquement pour les fichiers d'archive\ : cela demande au cache de ne jamais garder la requête. Cela peut éviter de polluer un cache mandataire avec des fichiers .deb très grands. Note\ : Squid 2.0.2 ne prend en compte aucune de ces options. +sert uniquement pour les fichiers d\'archive\ \&: cela demande au cache de ne jamais garder la requête\&. Cela peut éviter de polluer un cache mandataire avec des fichiers \&.deb très grands\&. Note\ \&: Squid 2\&.0\&.2 ne prend en compte aucune de ces options\&. .sp -L'option +L\'option timeout -positionne le compteur de temps mort (timeout) utilisé par la méthode\ : cela vaut pour tout (connexion, données). +positionne le compteur de temps mort (timeout) utilisé par la méthode\ \&: cela vaut pour tout (connexion, données)\&. .sp -Une option de configuration est fournie pour contrôler la profondeur du tube pour le cas où un serveur distant n'est pas conforme à la RFC ou est bogué (comme Squid 2.0.2). +Une option de configuration est fournie pour contrôler la profondeur du tube pour le cas où un serveur distant n\'est pas conforme à la RFC ou est bogué (comme Squid 2\&.0\&.2)\&. Acquire::http::Pipeline\-Depth -a une valeur comprise entre 0 et 5\ : elle indique le nombre de requêtes en attente qui peuvent être émises. Quand la machine distante ne conserve pas correctement les connexions TCP, on DOIT donner une valeur égale à 0 \-\- sinon des données seront corrompues. Les machines qui ont besoin de cette option ne respectent pas la RFC 2068. +a une valeur comprise entre 0 et 5\ \&: elle indique le nombre de requêtes en attente qui peuvent être émises\&. Quand la machine distante ne conserve pas correctement les connexions TCP, on DOIT donner une valeur égale à 0 \-\- sinon des données seront corrompues\&. Les machines qui ont besoin de cette option ne respectent pas la RFC 2068\&. .RE .PP ftp -.RS 3n -URI FTP ; ftp::Proxy est le serveur mandataire par défaut à utiliser. Il se présente sous la forme standard\ : -ftp://[[user][:pass]@]host[:port]/\ ; il est remplacé par la variable d'environnement -\fBftp_proxy\fR. Pour utiliser un mandataire ftp, vous devez renseigner l'entrée +.RS 4 +URI FTP ; ftp::Proxy est le serveur mandataire par défaut à utiliser\&. Il se présente sous la forme standard\ \&: +ftp://[[user][:pass]@]host[:port]/\ \&; il est remplacé par la variable d\'environnement +\fBftp_proxy\fR\&. Pour utiliser un mandataire ftp, vous devez renseigner l\'entrée ftp::ProxyLogin -dans le fichier de configuration. Cette entrée spécifie les commandes qui disent au serveur mandataire comment se connecter. Voyez -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -pour savoir comment faire. Les variables de substitution disponibles sont\ : +dans le fichier de configuration\&. Cette entrée spécifie les commandes qui disent au serveur mandataire comment se connecter\&. Voyez +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +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 élément de l'URI. +$(SITE_PORT)\&. Chacune correspond à un élément de l\'URI\&. .sp -L'option +L\'option timeout -positionne le compteur de temps mort (timeout) utilisé par la méthode\ : cela vaut pour tout (connexion, données). +positionne le compteur de temps mort (timeout) utilisé par la méthode\ \&: cela vaut pour tout (connexion, données)\&. .sp -Plusieurs options de configuration sont fournies pour contrôler le mode passif. Généralement, c'est plus sûr d'activer le mode passif\ ; cela marche dans presque tous les environnements. Cependant, certaines situations nécessitent que le mode passif soit désactivé et que le mode \(Fo\ port\ \(Fc de ftp soit utilisé à la place. On peut le faire globalement, pour des connexions qui passent par un mandataire ou pour une machine spécifique (examinez le modèle de fichier de configuration). +Plusieurs options de configuration sont fournies pour contrôler le mode passif\&. Généralement, c\'est plus sûr d\'activer le mode passif\ \&; cela marche dans presque tous les environnements\&. Cependant, certaines situations nécessitent que le mode passif soit désactivé et que le mode \(Fo\ \&port\ \&\(Fc de ftp soit utilisé à la place\&. On peut le faire globalement, pour des connexions qui passent par un mandataire ou pour une machine spécifique (examinez le modèle de fichier de configuration)\&. .sp -On peut utiliser un mandataire FTP pour atteindre une cible HTTP en positionnant la variable d'environnement +On peut utiliser un mandataire FTP pour atteindre une cible HTTP en positionnant la variable d\'environnement \fBftp_proxy\fR -à une url http \-\- consultez la méthode 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é. +à une url http \-\- consultez la méthode 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é\&. .sp -L'option +L\'option ForceExtended -contrôle l'utilisation des commandes liées à la RFC 2428, +contrôle l\'utilisation des commandes liées à la RFC 2428, EPSV et -EPRT. Par défaut, elle vaut \(Fo\ false\ \(Fc\ ; ce qui signifie que ces commandes ne sont utilisées que pour une connexion de type IPv6. Quand elle vaut \(Fo\ true\ \(Fc, on les utilise même si la connexion est de type IPv4. La plupart des serveurs FTP ne suivent pas la RFC 2428. +EPRT\&. Par défaut, elle vaut \(Fo\ \&false\ \&\(Fc\ \&; ce qui signifie que ces commandes ne sont utilisées que pour une connexion de type IPv6\&. Quand elle vaut \(Fo\ \&true\ \&\(Fc, on les utilise même si la connexion est de type IPv4\&. La plupart des serveurs FTP ne suivent pas la RFC 2428\&. .RE .PP cdrom -.RS 3n -URI CDROM\ ; la seule option de configuration pour les URI de CDROM est le point de montage\ : -cdrom::Mount\ ; il doit représenter le point de montage du lecteur de cédérom indiqué dans -\fI/etc/fstab\fR. On peut fournir d'autres commandes de montage et de démontage quand le point de montage ne peut être listé dans le fichier +.RS 4 +URI CDROM\ \&; la seule option de configuration pour les URI de CDROM est le point de montage\ \&: +cdrom::Mount\ \&; il doit représenter le point de montage du lecteur de cédérom indiqué dans +\fI/etc/fstab\fR\&. On peut fournir d\'autres commandes de montage et de démontage quand le point de montage ne peut être listé dans le fichier \fI/etc/fstab\fR -(par exemple, un montage SMB). Syntaxiquement, il faut placer +(par exemple, un montage SMB)\&. Syntaxiquement, il faut placer .sp -.RS 3n +.RS 4 .nf "/cdrom/"::Mount "foo"; .fi .RE .sp -dans le bloc cdrom. La barre oblique finale est importante. Les commandes de démontage peuvent être spécifiées en utilisant -UMount. +dans le bloc cdrom\&. La barre oblique finale est importante\&. Les commandes de démontage peuvent être spécifiées en utilisant +UMount\&. .RE .PP gpgv -.RS 3n -URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer des paramètres à gpgv. +.RS 4 +URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer des paramètres à gpgv\&. gpgv::Options -Options supplémentaires passées à gpgv. +Options supplémentaires passées à gpgv\&. .RE .SH "LES RÉPERTOIRES" .PP Les répertoires de la section Dir::State -concernent le système local. +concernent le système local\&. lists est le répertoire où placer les listes de paquets téléchargés et status -est le nom du fichier d'état de Dpkg. +est le nom du fichier d\'état de Dpkg\&. preferences -concerne APT\ : c'est le nom du fichier des préférences. +concerne APT\ \&: c\'est le nom du fichier des préférences\&. Dir::State contient le répertoire par défaut préfixé à tous les sous\-éléments, quand ceux\-ci ne commencent pas par \fI/\fR ou -\fI./\fR. +\fI\&./\fR\&. .PP Dir::Cache -contient les emplacements qui renseignent sur le cache local\ : par exemple, les deux caches de paquets +contient les emplacements qui renseignent sur le cache local\ \&: par exemple, les deux caches de paquets srcpkgcache et -pkgcache, et aussi l'endroit où sont placées les archives téléchargées, -Dir::Cache::archives. On peut empêcher la création des caches en laissant leur nom en blanc. Cela ralentit le démarrage mais cela sauve de l'espace disque. Il vaut mieux se passer du cache +pkgcache, et aussi l\'endroit où sont placées les archives téléchargées, +Dir::Cache::archives\&. On peut empêcher la création des caches en laissant leur nom en blanc\&. Cela ralentit le démarrage mais cela sauve de l\'espace disque\&. Il vaut mieux se passer du cache pkgcache plutôt que se passer du cache -srcpkgcache. Comme pour +srcpkgcache\&. Comme pour Dir::State, le répertoire par défaut est contenu dans -Dir::Cache. +Dir::Cache\&. .PP Dir::Etc -contient l'emplacement des fichiers de configuration, +contient l\'emplacement des fichiers de configuration, sourcelist -indique l'emplacement de la liste de sources et +indique l\'emplacement de la liste de sources et main -est le fichier de configuration par défaut (le modifier n'a aucun effet, à moins qu'on ne le modifie avec le fichier de configuration indiqué par la variable -\fBAPT_CONFIG\fR). +est le fichier de configuration par défaut (le modifier n\'a aucun effet, à moins qu\'on ne le modifie avec le fichier de configuration indiqué par la variable +\fBAPT_CONFIG\fR)\&. .PP Dir::Parts -lit, par ordre d'entrée, tous les fragments de configuration dans le répertoire indiqué. Ensuite, le fichier principal de configuration est chargé. +lit, par ordre d\'entrée, tous les fragments de configuration dans le répertoire indiqué\&. Ensuite, le fichier principal de configuration est chargé\&. .PP Les programmes binaires sont pointés par -Dir::Bin. L'emplacement des gestionnaires de méthodes est indiqué par -Dir::Bin::Methods\ ; +Dir::Bin\&. L\'emplacement des gestionnaires de méthodes est indiqué par +Dir::Bin::Methods\ \&; gzip, Dpkg, apt\-get, @@ -301,137 +301,139 @@ dpkg\-source, dpkg\-buildpackage et apt\-cache -indiquent l'emplacement des programmes correspondants. +indiquent l\'emplacement des programmes correspondants\&. .SH "APT ET DSELECT" .PP Quand APT est utilisé comme une méthode de -\fBdselect\fR(8), plusieurs directives contrôlent le comportement par défaut. On les trouve dans la section -DSelect. +\fBdselect\fR(8), plusieurs directives contrôlent le comportement par défaut\&. On les trouve dans la section +DSelect\&. .PP Clean -.RS 3n -Mode de nettoyage du cache\ ; cette variable peut prendre l'une des valeurs suivantes\ : \(Fo\ always\ \(Fc, \(Fo\ prompt\ \(Fc, \(Fo\ auto\ \(Fc, \(Fo\ pre\-auto\ \(Fc et \(Fo\ never\ \(Fc. \(Fo\ always\ \(Fc et \(Fo\ prompt\ \(Fc suppriment tous les paquets du cache après la mise à niveau\ ; \(Fo\ prompt\ \(Fc (valeur par défaut) les supprime après une demande et \(Fo\ auto\ \(Fc ne supprime que les archives qui ne peuvent plus être téléchargées (remplacées, par exemple, par une nouvelle version). \(Fo\ pre\-auto\ \(Fc les supprime avant de récupérer de nouveaux paquets. +.RS 4 +Mode de nettoyage du cache\ \&; cette variable peut prendre l\'une des valeurs suivantes\ \&: \(Fo\ \&always\ \&\(Fc, \(Fo\ \&prompt\ \&\(Fc, \(Fo\ \&auto\ \&\(Fc, \(Fo\ \&pre\-auto\ \&\(Fc et \(Fo\ \&never\ \&\(Fc\&. \(Fo\ \&always\ \&\(Fc et \(Fo\ \&prompt\ \&\(Fc suppriment tous les paquets du cache après la mise à niveau\ \&; \(Fo\ \&prompt\ \&\(Fc (valeur par défaut) les supprime après une demande et \(Fo\ \&auto\ \&\(Fc ne supprime que les archives qui ne peuvent plus être téléchargées (remplacées, par exemple, par une nouvelle version)\&. \(Fo\ \&pre\-auto\ \&\(Fc les supprime avant de récupérer de nouveaux paquets\&. .RE .PP Options -.RS 3n +.RS 4 Le contenu de cette variable est passé à -\fBapt\-get\fR(8) -avec les options de la ligne de commande quand ce programme est utilisé dans la phase d'installation. +\fBapt-get\fR(8) +avec les options de la ligne de commande quand ce programme est utilisé dans la phase d\'installation\&. .RE .PP UpdateOptions -.RS 3n +.RS 4 Le contenu de cette variable est passé à -\fBapt\-get\fR(8) -avec les options de la ligne de commande quand ce programme est utilisé dans la phase de mise à jour. +\fBapt-get\fR(8) +avec les options de la ligne de commande quand ce programme est utilisé dans la phase de mise à jour\&. .RE .PP PromptAfterUpdate -.RS 3n -Si cette option est \(Fo\ vraie\ \(Fc, l'opération [U]pdate de +.RS 4 +Si cette option est \(Fo\ \&vraie\ \&\(Fc, l\'opération [U]pdate de \fBdselect\fR(8) -interroge toujours l'utilisateur avant de continuer. Par défaut, ce n'est qu'en cas d'erreur que l'on propose à l'utilisateur d'intervenir. +interroge toujours l\'utilisateur avant de continuer\&. Par défaut, ce n\'est qu\'en cas d\'erreur que l\'on propose à l\'utilisateur d\'intervenir\&. .RE .SH "COMMENT APT APPELLE DPKG" .PP Plusieurs directives de configuration contrôlent la manière dont APT invoque -\fBdpkg\fR(8)\ : elles figurent dans la section -DPkg. +\fBdpkg\fR(8)\ \&: elles figurent dans la section +DPkg\&. .PP Options -.RS 3n -Il s'agit d'une liste d'options à passer à dpkg. Les options doivent être déclarées en utilisant la notation de liste et chaque élément de liste est passé comme un seul argument à -\fBdpkg\fR(8). +.RS 4 +Il s\'agit d\'une liste d\'options à passer à dpkg\&. Les options doivent être déclarées en utilisant la notation de liste et chaque élément de liste est passé comme un seul argument à +\fBdpkg\fR(8)\&. .RE .PP Pre\-Invoke, Post\-Invoke -.RS 3n -Il s'agit d'une liste de commandes shell à exécuter avant ou après l'appel de -\fBdpkg\fR(8). Tout comme pour -Options, on doit utiliser la notation de liste. Les commandes sont appelées dans l'ordre, en utilisant -\fI/bin/sh\fR\ : APT s'arrête dès que l'une d'elles échoue. +.RS 4 +Il s\'agit d\'une liste de commandes shell à exécuter avant ou après l\'appel de +\fBdpkg\fR(8)\&. Tout comme pour +Options, on doit utiliser la notation de liste\&. Les commandes sont appelées dans l\'ordre, en utilisant +\fI/bin/sh\fR\ \&: APT s\'arrête dès que l\'une d\'elles échoue\&. .RE .PP Pre\-Install\-Pkgs -.RS 3n -Il s'agit d'une liste de commandes shell à exécuter avant d'appeler Dpkg. Tout comme pour -Options, on doit utiliser la notation de liste. Les commandes sont appelées dans l'ordre, en utilisant -\fI/bin/sh\fR\ : APT s'arrête dès que l'une d'elles échoue. Sur l'entrée standard, APT transmet aux commandes les noms de tous les fichiers .deb qu'il va installer, à raison d'un par ligne. +.RS 4 +Il s\'agit d\'une liste de commandes shell à exécuter avant d\'appeler Dpkg\&. Tout comme pour +Options, on doit utiliser la notation de liste\&. Les commandes sont appelées dans l\'ordre, en utilisant +\fI/bin/sh\fR\ \&: APT s\'arrête dès que l\'une d\'elles échoue\&. Sur l\'entrée standard, APT transmet aux commandes les noms de tous les fichiers \&.deb qu\'il va installer, à raison d\'un par ligne\&. .sp -La deuxième version de ce protocole donne plus de renseignements\ : on obtient la version du protocole, la configuration de APT et les paquets, fichiers ou versions qui ont changé. On autorise cette version en positionnant +La deuxième version de ce protocole donne plus de renseignements\ \&: on obtient la version du protocole, la configuration de APT et les paquets, fichiers ou versions qui ont changé\&. On autorise cette version en positionnant DPkg::Tools::Options::cmd::Version -à 2. +à 2\&. cmd est une commande passée à -Pre\-Install\-Pkgs. +Pre\-Install\-Pkgs\&. .RE .PP Run\-Directory -.RS 3n -APT se place dans ce répertoire avant d'appeler Dpkg\ ; par défaut c'est le répertoire -\fI/\fR. +.RS 4 +APT se place dans ce répertoire avant d\'appeler Dpkg\ \&; par défaut c\'est le répertoire +\fI/\fR\&. .RE .PP Build\-Options -.RS 3n +.RS 4 Ces options sont passées à -\fBdpkg\-buildpackage\fR(1) -lors de la compilation des paquets\ ; par défaut la signature est désactivée et tous les binaires sont créés. +\fBdpkg-buildpackage\fR(1) +lors de la compilation des paquets\ \&; par défaut la signature est désactivée et tous les binaires sont créés\&. .RE .SH "LES OPTIONS DE DÉBOGAGE" .PP La plupart des options de la section debug -n'ont aucun intérêt pour le simple utilisateur\ ; cependant, +n\'ont aucun intérêt pour le simple utilisateur\ \&; cependant, Debug::pkgProblemResolver -affiche d'intéressantes informations sur les décisions que prend la commande dist\-upgrade. +affiche d\'intéressantes informations sur les décisions que prend la commande dist\-upgrade\&. Debug::NoLocking -désactive le verrouillage de fichier de manière à ce que APT puisse effectuer quelques opérations sans être \(Fo\ root\ \(Fc et +désactive le verrouillage de fichier de manière à ce que APT puisse effectuer quelques opérations sans être \(Fo\ \&root\ \&\(Fc et Debug::pkgDPkgPM -affiche la ligne de commande à chaque appel de Dpkg. +affiche la ligne de commande à chaque appel de Dpkg\&. Debug::IdentCdrom -désactive l'inclusion de données de type statfs dans les ID de CDROM. +désactive l\'inclusion de données de type statfs dans les ID de CDROM\&. Debug::Acquire::gpgv -Débogage de la méthode gpgv. +Débogage de la méthode gpgv\&. .SH "EXEMPLES" .PP Le fichier -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -contient un modèle de fichier montrant les valeurs par défaut de toutes les options possibles. +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +contient un modèle de fichier montrant les valeurs par défaut de toutes les options possibles\&. .SH "FICHIERS" .PP -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8), -\fBapt\-config\fR(8), -\fBapt_preferences\fR(5). +\fBapt-cache\fR(8), +\fBapt-config\fR(8), +\fBapt_preferences\fR(5)\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt.conf.fr.5 b/doc/fr/apt.conf.fr.5 index 804c834..44a88a7 100644 --- a/doc/fr/apt.conf.fr.5 +++ b/doc/fr/apt.conf.fr.5 @@ -1,11 +1,11 @@ .\" Title: apt.conf .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT.CONF" "5" "29 Février 2004" "Linux" "" +.TH "APT\&.CONF" "5" "29 Février 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,24 +15,24 @@ apt.conf \- Fichier de configuration pour APT .SH "DESCRIPTION" .PP Le fichier -\fIapt.conf\fR -est le principal fichier de configuration de la collection d'outils que constitue APT\ ; tous les outils font appel à ce fichier de configuration et utilisent un analyseur syntaxique en ligne de commande commun afin de fournir un environnement uniforme. Quand un outil d'APT démarre, il lit (si elle existe) la variable d'environnement -\fBAPT_CONFIG\fR\ ; puis il lit les fichiers situés dans +\fIapt\&.conf\fR +est le principal fichier de configuration de la collection d\'outils que constitue APT\ \&; tous les outils font appel à ce fichier de configuration et utilisent un analyseur syntaxique en ligne de commande commun afin de fournir un environnement uniforme\&. Quand un outil d\'APT démarre, il lit (si elle existe) la variable d\'environnement +\fBAPT_CONFIG\fR\ \&; puis il lit les fichiers situés 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 nécessaire, d'autres fichiers de configuration. +Dir::Etc::main\ \&; enfin il applique les options de la ligne de commande qui annulent les directives de configuration, chargeant, si nécessaire, d\'autres fichiers de configuration\&. .PP -Le fichier de configuration est construit comme un arbre d'options organisées en groupes fonctionnels. On se sert du double deux points (\(Fo\ ::\ \(Fc) pour indiquer une option\ ; par exemple, +Le fichier de configuration est construit comme un arbre d\'options organisées en groupes fonctionnels\&. On se sert du double deux points (\(Fo\ \&::\ \&\(Fc) pour indiquer une option\ \&; par exemple, APT::Get::Assume\-Yes -est une option pour le groupe d'outils APT, destinée à l'outil Get. Les options n'héritent pas des groupes de leurs parents. +est une option pour le groupe d\'outils APT, destinée à l\'outil Get\&. Les options n\'héritent pas des groupes de leurs parents\&. .PP -Syntaxiquement, le langage de configuration est conçu sur le même modèle que les langages utilisés par des outils ISC tels que bind et dhcp. Une ligne qui commence par +Syntaxiquement, le langage de configuration est conçu sur le même modèle que les langages utilisés par des outils ISC tels que bind et dhcp\&. Une ligne qui commence par // -est un commentaire et elle est ignorée. Chaque ligne est de la forme\ : +est un commentaire et elle est ignorée\&. Chaque ligne est de la forme\ \&: APT::Get::Assume\-Yes "true"; -Le point\-virgule final est obligatoire et les guillemets sont optionnels. On peut déclarer un nouveau champ d'action avec des accolades, comme suit\ : +Le point\-virgule final est obligatoire et les guillemets sont optionnels\&. On peut déclarer un nouveau champ d\'action avec des accolades, comme suit\ \&: .sp -.RS 3n +.RS 4 .nf APT { @@ -44,9 +44,9 @@ APT { .fi .RE .PP -avec des retours à la ligne pour faciliter la lecture. On peut créer 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 entrées, séparées par un point\-virgule. +avec des retours à la ligne pour faciliter la lecture\&. On peut créer 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 entrées, séparées par un point\-virgule\&. .sp -.RS 3n +.RS 4 .nf DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; @@ -54,246 +54,246 @@ DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; .RE .PP Les modèles -\fI/usr/share/doc/apt/examples/apt.conf\fR -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -montrent à quoi devrait ressembler le fichier de configuration. +\fI/usr/share/doc/apt/examples/apt\&.conf\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +montrent à quoi devrait ressembler le fichier de configuration\&. .PP -Deux éléments spéciaux sont autorisés\ : +Deux éléments spéciaux sont autorisés\ \&: #include et -#clear. +#clear\&. #include -inclut le fichier donné en argument, à moins que le nom ne se termine par une barre oblique. +inclut le fichier donné en argument, à moins que le nom ne se termine par une barre oblique\&. #clear -sert à effacer une liste de noms. +sert à effacer une liste de noms\&. .PP -Tous les outils d'APT possèdent une option +Tous les outils d\'APT possèdent une option \fB\-o\fR -qui permet de spécifier une configuration arbitraire depuis la ligne de commande. La syntaxe consiste en un nom complet d'option (par exemple -APT::Get::Assume\-Yes) suivi par un signe égal, puis par la nouvelle valeur de l'option. On peut compléter une liste en ajoutant un \(Fo\ ::\ \(Fc au nom de la liste. +qui permet de spécifier une configuration arbitraire depuis la ligne de commande\&. La syntaxe consiste en un nom complet d\'option (par exemple +APT::Get::Assume\-Yes) suivi par un signe égal, puis par la nouvelle valeur de l\'option\&. On peut compléter une liste en ajoutant un \(Fo\ \&::\ \&\(Fc au nom de la liste\&. .SH "LE GROUPE APT" .PP -Ce groupe d'options contrôle aussi bien le comportement global d'APT que la prise en compte des options pour chaque outil. +Ce groupe d\'options contrôle aussi bien le comportement global d\'APT que la prise en compte des options pour chaque outil\&. .PP Architecture -.RS 3n -L'architecture du système\ ; cette option positionne l'architecture à utiliser pour récupérer des fichiers et analyser des listes de paquets. L'architecture interne par défaut est celle pour laquelle APT a été compilé. +.RS 4 +L\'architecture du système\ \&; cette option positionne l\'architecture à utiliser pour récupérer des fichiers et analyser des listes de paquets\&. L\'architecture interne par défaut est celle pour laquelle APT a été compilé\&. .RE .PP Ignore\-Hold -.RS 3n -Ignore les paquets \(Fo\ gelés\ \(Fc\ ; cette option globale indique au système de résolution de ne pas tenir compte des paquets \(Fo\ gelés\ \(Fc dans sa prise de décision. +.RS 4 +Ignore les paquets \(Fo\ \&gelés\ \&\(Fc\ \&; cette option globale indique au système de résolution de ne pas tenir compte des paquets \(Fo\ \&gelés\ \&\(Fc dans sa prise de décision\&. .RE .PP Clean\-Installed -.RS 3n -Avec cette option qui est activée par défaut, la fonctionnalité \(Fo\ autoclean\ \(Fc supprime tout paquet qui ne peut plus être récupéré dans le cache. Quand cette option est désactivée, les paquets qui sont installés localement sont aussi exclus du nettoyage \- mais notez que APT ne fournit aucun moyen direct pour les réinstaller. +.RS 4 +Avec cette option qui est activée par défaut, la fonctionnalité \(Fo\ \&autoclean\ \&\(Fc supprime tout paquet qui ne peut plus être récupéré dans le cache\&. Quand cette option est désactivée, les paquets qui sont installés localement sont aussi exclus du nettoyage \- mais notez que APT ne fournit aucun moyen direct pour les réinstaller\&. .RE .PP Immediate\-Configure -.RS 3n -Désactive la configuration immédiate\ ; cette dangereuse option désactive une partie du code de mise en ordre de APT pour que ce dernier effectue le moins d'appels possible à Dpkg. C'est peut\-être nécessaire sur des systèmes lents à un seul utilisateur mais c'est extrêmement dangereux et cela peut faire échouer les scripts d'installation, voire pire. Utilisez\-la à vos risques et périls. +.RS 4 +Désactive la configuration immédiate\ \&; cette dangereuse option désactive une partie du code de mise en ordre de APT pour que ce dernier effectue le moins d\'appels possible à Dpkg\&. C\'est peut\-être nécessaire sur des systèmes lents à un seul utilisateur mais c\'est extrêmement dangereux et cela peut faire échouer les scripts d\'installation, voire pire\&. Utilisez\-la à vos risques et périls\&. .RE .PP Force\-LoopBreak -.RS 3n -Ne jamais activer cette option à moins que vous ne sachiez \- réellement \- ce que vous faites. Elle autorise APT à supprimer temporairement un paquet essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / Pre\-Depends entre deux paquets essentiels. UNE TELLE BOUCLE NE DOIT JAMAIS SE PRODUIRE\ : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont ces paquets dépendent. +.RS 4 +Ne jamais activer cette option à moins que vous ne sachiez \- réellement \- ce que vous faites\&. Elle autorise APT à supprimer temporairement un paquet essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / Pre\-Depends entre deux paquets essentiels\&. UNE TELLE BOUCLE NE DOIT JAMAIS SE PRODUIRE\ \&: C\'EST UN BOGUE SÉRIEUX\&. Cette option fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont ces paquets dépendent\&. .RE .PP Cache\-Limit -.RS 3n -APT utilise un fichier cache d'une taille mémoire fixe pour ranger les informations du fichier \(Fo\ available\ \(Fc. Cette option fixe la taille de ce cache. +.RS 4 +APT utilise un fichier cache d\'une taille mémoire fixe pour ranger les informations du fichier \(Fo\ \&available\ \&\(Fc\&. Cette option fixe la taille de ce cache\&. .RE .PP Build\-Essential -.RS 3n -Cette option définit les paquets qui sont considérés comme faisant partie des dépendances essentielles pour la construction des paquets. +.RS 4 +Cette option définit les paquets qui sont considérés comme faisant partie des dépendances essentielles pour la construction des paquets\&. .RE .PP Get -.RS 3n +.RS 4 La sous\-section Get -contrôle l'outil -\fBapt\-get\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil +\fBapt-get\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .PP Cache -.RS 3n +.RS 4 La sous\-section Cache -contrôle l'outil -\fBapt\-cache\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil +\fBapt-cache\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .PP CDROM -.RS 3n +.RS 4 La sous\-section CDROM -contrôle l'outil\fBapt\-cdrom\fR(8), veuillez consulter sa documentation pour avoir plus d'informations sur les options en question. +contrôle l\'outil\fBapt-cdrom\fR(8), veuillez consulter sa documentation pour avoir plus d\'informations sur les options en question\&. .RE .SH "LE GROUPE ACQUIRE" .PP -Le groupe d'options +Le groupe d\'options Acquire -contrôle le téléchargement des paquets et les gestionnaires d'URI. +contrôle le téléchargement des paquets et les gestionnaires d\'URI\&. .PP Queue\-Mode -.RS 3n -Le mode file d'attente\ ; +.RS 4 +Le mode file d\'attente\ \&; Queue\-Mode peut prendre une valeur parmi host ou access -et cela détermine comment APT parallélise les connexions sortantes. +et cela détermine comment APT parallélise les connexions sortantes\&. Host -signifie qu'une connexion par cible sera initiée, tandis que +signifie qu\'une connexion par cible sera initiée, tandis que access -signifie qu'une connexion par type d'URI sera initiée. +signifie qu\'une connexion par type d\'URI sera initiée\&. .RE .PP Retries -.RS 3n -Nombre d'essais à effectuer. Si ce nombre n'est pas nul, APT essaie de récupérer, le nombre donné de fois, les fichiers dont la récupération a échoué. +.RS 4 +Nombre d\'essais à effectuer\&. Si ce nombre n\'est pas nul, APT essaie de récupérer, le nombre donné de fois, les fichiers dont la récupération a échoué\&. .RE .PP Source\-Symlinks -.RS 3n -Utilise des liens symboliques pour les archives de sources. Positionnée à \(Fo\ true\ \(Fc, cette option crée si possible des liens symboliques vers les archives de sources au lieu de les copier. Par défaut à \(Fo\ true\ \(Fc. +.RS 4 +Utilise des liens symboliques pour les archives de sources\&. Positionnée à \(Fo\ \&true\ \&\(Fc, cette option crée si possible des liens symboliques vers les archives de sources au lieu de les copier\&. Par défaut à \(Fo\ \&true\ \&\(Fc\&. .RE .PP http -.RS 3n -URI HTTP ; http::Proxy est le mandataire (proxy) http à utiliser par défaut. Il se présente sous la forme standard\ : -http://[[user][:pass]@]host[:port]/. En utilisant la syntaxe\ : +.RS 4 +URI HTTP ; http::Proxy est le mandataire (proxy) http à utiliser par défaut\&. Il se présente sous la forme standard\ \&: +http://[[user][:pass]@]host[:port]/\&. En utilisant la syntaxe\ \&: http::Proxy::, où le mot\-clé spécial DIRECT -indique de n'utiliser aucun mandataire, on peut spécifier un mandataire pour chaque machine distante. La variable d'environnement +indique de n\'utiliser aucun mandataire, on peut spécifier un mandataire pour chaque machine distante\&. La variable d\'environnement \fBhttp_proxy\fR -remplace tous ces paramètres. +remplace tous ces paramètres\&. .sp -Trois options de configuration sont fournies pour le contrôle des caches qui sont compatibles avec HTTP/1.1. +Trois options de configuration sont fournies pour le contrôle des caches qui sont compatibles avec HTTP/1\&.1\&. No\-Cache -signifie que le mandataire ne doit pas du tout utiliser les réponses qu'il a stockées\ ; +signifie que le mandataire ne doit pas du tout utiliser les réponses qu\'il a stockées\ \&; Max\-Age -sert uniquement pour les fichiers d'index\ : cela demande au cache de les mettre à jour quand leur ancienneté est supérieure au nombre de secondes donné. Debian met à jour son fichier d'index de manière journalière, la valeur par défaut est donc de 1 jour. +sert uniquement pour les fichiers d\'index\ \&: cela demande au cache de les mettre à jour quand leur ancienneté est supérieure au nombre de secondes donné\&. Debian met à jour son fichier d\'index de manière journalière, la valeur par défaut est donc de 1 jour\&. No\-Store -sert uniquement pour les fichiers d'archive\ : cela demande au cache de ne jamais garder la requête. Cela peut éviter de polluer un cache mandataire avec des fichiers .deb très grands. Note\ : Squid 2.0.2 ne prend en compte aucune de ces options. +sert uniquement pour les fichiers d\'archive\ \&: cela demande au cache de ne jamais garder la requête\&. Cela peut éviter de polluer un cache mandataire avec des fichiers \&.deb très grands\&. Note\ \&: Squid 2\&.0\&.2 ne prend en compte aucune de ces options\&. .sp -L'option +L\'option timeout -positionne le compteur de temps mort (timeout) utilisé par la méthode\ : cela vaut pour tout (connexion, données). +positionne le compteur de temps mort (timeout) utilisé par la méthode\ \&: cela vaut pour tout (connexion, données)\&. .sp -Une option de configuration est fournie pour contrôler la profondeur du tube pour le cas où un serveur distant n'est pas conforme à la RFC ou est bogué (comme Squid 2.0.2). +Une option de configuration est fournie pour contrôler la profondeur du tube pour le cas où un serveur distant n\'est pas conforme à la RFC ou est bogué (comme Squid 2\&.0\&.2)\&. Acquire::http::Pipeline\-Depth -a une valeur comprise entre 0 et 5\ : elle indique le nombre de requêtes en attente qui peuvent être émises. Quand la machine distante ne conserve pas correctement les connexions TCP, on DOIT donner une valeur égale à 0 \-\- sinon des données seront corrompues. Les machines qui ont besoin de cette option ne respectent pas la RFC 2068. +a une valeur comprise entre 0 et 5\ \&: elle indique le nombre de requêtes en attente qui peuvent être émises\&. Quand la machine distante ne conserve pas correctement les connexions TCP, on DOIT donner une valeur égale à 0 \-\- sinon des données seront corrompues\&. Les machines qui ont besoin de cette option ne respectent pas la RFC 2068\&. .RE .PP ftp -.RS 3n -URI FTP ; ftp::Proxy est le serveur mandataire par défaut à utiliser. Il se présente sous la forme standard\ : -ftp://[[user][:pass]@]host[:port]/\ ; il est remplacé par la variable d'environnement -\fBftp_proxy\fR. Pour utiliser un mandataire ftp, vous devez renseigner l'entrée +.RS 4 +URI FTP ; ftp::Proxy est le serveur mandataire par défaut à utiliser\&. Il se présente sous la forme standard\ \&: +ftp://[[user][:pass]@]host[:port]/\ \&; il est remplacé par la variable d\'environnement +\fBftp_proxy\fR\&. Pour utiliser un mandataire ftp, vous devez renseigner l\'entrée ftp::ProxyLogin -dans le fichier de configuration. Cette entrée spécifie les commandes qui disent au serveur mandataire comment se connecter. Voyez -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -pour savoir comment faire. Les variables de substitution disponibles sont\ : +dans le fichier de configuration\&. Cette entrée spécifie les commandes qui disent au serveur mandataire comment se connecter\&. Voyez +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +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 élément de l'URI. +$(SITE_PORT)\&. Chacune correspond à un élément de l\'URI\&. .sp -L'option +L\'option timeout -positionne le compteur de temps mort (timeout) utilisé par la méthode\ : cela vaut pour tout (connexion, données). +positionne le compteur de temps mort (timeout) utilisé par la méthode\ \&: cela vaut pour tout (connexion, données)\&. .sp -Plusieurs options de configuration sont fournies pour contrôler le mode passif. Généralement, c'est plus sûr d'activer le mode passif\ ; cela marche dans presque tous les environnements. Cependant, certaines situations nécessitent que le mode passif soit désactivé et que le mode \(Fo\ port\ \(Fc de ftp soit utilisé à la place. On peut le faire globalement, pour des connexions qui passent par un mandataire ou pour une machine spécifique (examinez le modèle de fichier de configuration). +Plusieurs options de configuration sont fournies pour contrôler le mode passif\&. Généralement, c\'est plus sûr d\'activer le mode passif\ \&; cela marche dans presque tous les environnements\&. Cependant, certaines situations nécessitent que le mode passif soit désactivé et que le mode \(Fo\ \&port\ \&\(Fc de ftp soit utilisé à la place\&. On peut le faire globalement, pour des connexions qui passent par un mandataire ou pour une machine spécifique (examinez le modèle de fichier de configuration)\&. .sp -On peut utiliser un mandataire FTP pour atteindre une cible HTTP en positionnant la variable d'environnement +On peut utiliser un mandataire FTP pour atteindre une cible HTTP en positionnant la variable d\'environnement \fBftp_proxy\fR -à une url http \-\- consultez la méthode 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é. +à une url http \-\- consultez la méthode 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é\&. .sp -L'option +L\'option ForceExtended -contrôle l'utilisation des commandes liées à la RFC 2428, +contrôle l\'utilisation des commandes liées à la RFC 2428, EPSV et -EPRT. Par défaut, elle vaut \(Fo\ false\ \(Fc\ ; ce qui signifie que ces commandes ne sont utilisées que pour une connexion de type IPv6. Quand elle vaut \(Fo\ true\ \(Fc, on les utilise même si la connexion est de type IPv4. La plupart des serveurs FTP ne suivent pas la RFC 2428. +EPRT\&. Par défaut, elle vaut \(Fo\ \&false\ \&\(Fc\ \&; ce qui signifie que ces commandes ne sont utilisées que pour une connexion de type IPv6\&. Quand elle vaut \(Fo\ \&true\ \&\(Fc, on les utilise même si la connexion est de type IPv4\&. La plupart des serveurs FTP ne suivent pas la RFC 2428\&. .RE .PP cdrom -.RS 3n -URI CDROM\ ; la seule option de configuration pour les URI de CDROM est le point de montage\ : -cdrom::Mount\ ; il doit représenter le point de montage du lecteur de cédérom indiqué dans -\fI/etc/fstab\fR. On peut fournir d'autres commandes de montage et de démontage quand le point de montage ne peut être listé dans le fichier +.RS 4 +URI CDROM\ \&; la seule option de configuration pour les URI de CDROM est le point de montage\ \&: +cdrom::Mount\ \&; il doit représenter le point de montage du lecteur de cédérom indiqué dans +\fI/etc/fstab\fR\&. On peut fournir d\'autres commandes de montage et de démontage quand le point de montage ne peut être listé dans le fichier \fI/etc/fstab\fR -(par exemple, un montage SMB). Syntaxiquement, il faut placer +(par exemple, un montage SMB)\&. Syntaxiquement, il faut placer .sp -.RS 3n +.RS 4 .nf "/cdrom/"::Mount "foo"; .fi .RE .sp -dans le bloc cdrom. La barre oblique finale est importante. Les commandes de démontage peuvent être spécifiées en utilisant -UMount. +dans le bloc cdrom\&. La barre oblique finale est importante\&. Les commandes de démontage peuvent être spécifiées en utilisant +UMount\&. .RE .PP gpgv -.RS 3n -URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer des paramètres à gpgv. +.RS 4 +URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer des paramètres à gpgv\&. gpgv::Options -Options supplémentaires passées à gpgv. +Options supplémentaires passées à gpgv\&. .RE .SH "LES RÉPERTOIRES" .PP Les répertoires de la section Dir::State -concernent le système local. +concernent le système local\&. lists est le répertoire où placer les listes de paquets téléchargés et status -est le nom du fichier d'état de Dpkg. +est le nom du fichier d\'état de Dpkg\&. preferences -concerne APT\ : c'est le nom du fichier des préférences. +concerne APT\ \&: c\'est le nom du fichier des préférences\&. Dir::State contient le répertoire par défaut préfixé à tous les sous\-éléments, quand ceux\-ci ne commencent pas par \fI/\fR ou -\fI./\fR. +\fI\&./\fR\&. .PP Dir::Cache -contient les emplacements qui renseignent sur le cache local\ : par exemple, les deux caches de paquets +contient les emplacements qui renseignent sur le cache local\ \&: par exemple, les deux caches de paquets srcpkgcache et -pkgcache, et aussi l'endroit où sont placées les archives téléchargées, -Dir::Cache::archives. On peut empêcher la création des caches en laissant leur nom en blanc. Cela ralentit le démarrage mais cela sauve de l'espace disque. Il vaut mieux se passer du cache +pkgcache, et aussi l\'endroit où sont placées les archives téléchargées, +Dir::Cache::archives\&. On peut empêcher la création des caches en laissant leur nom en blanc\&. Cela ralentit le démarrage mais cela sauve de l\'espace disque\&. Il vaut mieux se passer du cache pkgcache plutôt que se passer du cache -srcpkgcache. Comme pour +srcpkgcache\&. Comme pour Dir::State, le répertoire par défaut est contenu dans -Dir::Cache. +Dir::Cache\&. .PP Dir::Etc -contient l'emplacement des fichiers de configuration, +contient l\'emplacement des fichiers de configuration, sourcelist -indique l'emplacement de la liste de sources et +indique l\'emplacement de la liste de sources et main -est le fichier de configuration par défaut (le modifier n'a aucun effet, à moins qu'on ne le modifie avec le fichier de configuration indiqué par la variable -\fBAPT_CONFIG\fR). +est le fichier de configuration par défaut (le modifier n\'a aucun effet, à moins qu\'on ne le modifie avec le fichier de configuration indiqué par la variable +\fBAPT_CONFIG\fR)\&. .PP Dir::Parts -lit, par ordre d'entrée, tous les fragments de configuration dans le répertoire indiqué. Ensuite, le fichier principal de configuration est chargé. +lit, par ordre d\'entrée, tous les fragments de configuration dans le répertoire indiqué\&. Ensuite, le fichier principal de configuration est chargé\&. .PP Les programmes binaires sont pointés par -Dir::Bin. L'emplacement des gestionnaires de méthodes est indiqué par -Dir::Bin::Methods\ ; +Dir::Bin\&. L\'emplacement des gestionnaires de méthodes est indiqué par +Dir::Bin::Methods\ \&; gzip, Dpkg, apt\-get, @@ -301,137 +301,139 @@ dpkg\-source, dpkg\-buildpackage et apt\-cache -indiquent l'emplacement des programmes correspondants. +indiquent l\'emplacement des programmes correspondants\&. .SH "APT ET DSELECT" .PP Quand APT est utilisé comme une méthode de -\fBdselect\fR(8), plusieurs directives contrôlent le comportement par défaut. On les trouve dans la section -DSelect. +\fBdselect\fR(8), plusieurs directives contrôlent le comportement par défaut\&. On les trouve dans la section +DSelect\&. .PP Clean -.RS 3n -Mode de nettoyage du cache\ ; cette variable peut prendre l'une des valeurs suivantes\ : \(Fo\ always\ \(Fc, \(Fo\ prompt\ \(Fc, \(Fo\ auto\ \(Fc, \(Fo\ pre\-auto\ \(Fc et \(Fo\ never\ \(Fc. \(Fo\ always\ \(Fc et \(Fo\ prompt\ \(Fc suppriment tous les paquets du cache après la mise à niveau\ ; \(Fo\ prompt\ \(Fc (valeur par défaut) les supprime après une demande et \(Fo\ auto\ \(Fc ne supprime que les archives qui ne peuvent plus être téléchargées (remplacées, par exemple, par une nouvelle version). \(Fo\ pre\-auto\ \(Fc les supprime avant de récupérer de nouveaux paquets. +.RS 4 +Mode de nettoyage du cache\ \&; cette variable peut prendre l\'une des valeurs suivantes\ \&: \(Fo\ \&always\ \&\(Fc, \(Fo\ \&prompt\ \&\(Fc, \(Fo\ \&auto\ \&\(Fc, \(Fo\ \&pre\-auto\ \&\(Fc et \(Fo\ \&never\ \&\(Fc\&. \(Fo\ \&always\ \&\(Fc et \(Fo\ \&prompt\ \&\(Fc suppriment tous les paquets du cache après la mise à niveau\ \&; \(Fo\ \&prompt\ \&\(Fc (valeur par défaut) les supprime après une demande et \(Fo\ \&auto\ \&\(Fc ne supprime que les archives qui ne peuvent plus être téléchargées (remplacées, par exemple, par une nouvelle version)\&. \(Fo\ \&pre\-auto\ \&\(Fc les supprime avant de récupérer de nouveaux paquets\&. .RE .PP Options -.RS 3n +.RS 4 Le contenu de cette variable est passé à -\fBapt\-get\fR(8) -avec les options de la ligne de commande quand ce programme est utilisé dans la phase d'installation. +\fBapt-get\fR(8) +avec les options de la ligne de commande quand ce programme est utilisé dans la phase d\'installation\&. .RE .PP UpdateOptions -.RS 3n +.RS 4 Le contenu de cette variable est passé à -\fBapt\-get\fR(8) -avec les options de la ligne de commande quand ce programme est utilisé dans la phase de mise à jour. +\fBapt-get\fR(8) +avec les options de la ligne de commande quand ce programme est utilisé dans la phase de mise à jour\&. .RE .PP PromptAfterUpdate -.RS 3n -Si cette option est \(Fo\ vraie\ \(Fc, l'opération [U]pdate de +.RS 4 +Si cette option est \(Fo\ \&vraie\ \&\(Fc, l\'opération [U]pdate de \fBdselect\fR(8) -interroge toujours l'utilisateur avant de continuer. Par défaut, ce n'est qu'en cas d'erreur que l'on propose à l'utilisateur d'intervenir. +interroge toujours l\'utilisateur avant de continuer\&. Par défaut, ce n\'est qu\'en cas d\'erreur que l\'on propose à l\'utilisateur d\'intervenir\&. .RE .SH "COMMENT APT APPELLE DPKG" .PP Plusieurs directives de configuration contrôlent la manière dont APT invoque -\fBdpkg\fR(8)\ : elles figurent dans la section -DPkg. +\fBdpkg\fR(8)\ \&: elles figurent dans la section +DPkg\&. .PP Options -.RS 3n -Il s'agit d'une liste d'options à passer à dpkg. Les options doivent être déclarées en utilisant la notation de liste et chaque élément de liste est passé comme un seul argument à -\fBdpkg\fR(8). +.RS 4 +Il s\'agit d\'une liste d\'options à passer à dpkg\&. Les options doivent être déclarées en utilisant la notation de liste et chaque élément de liste est passé comme un seul argument à +\fBdpkg\fR(8)\&. .RE .PP Pre\-Invoke, Post\-Invoke -.RS 3n -Il s'agit d'une liste de commandes shell à exécuter avant ou après l'appel de -\fBdpkg\fR(8). Tout comme pour -Options, on doit utiliser la notation de liste. Les commandes sont appelées dans l'ordre, en utilisant -\fI/bin/sh\fR\ : APT s'arrête dès que l'une d'elles échoue. +.RS 4 +Il s\'agit d\'une liste de commandes shell à exécuter avant ou après l\'appel de +\fBdpkg\fR(8)\&. Tout comme pour +Options, on doit utiliser la notation de liste\&. Les commandes sont appelées dans l\'ordre, en utilisant +\fI/bin/sh\fR\ \&: APT s\'arrête dès que l\'une d\'elles échoue\&. .RE .PP Pre\-Install\-Pkgs -.RS 3n -Il s'agit d'une liste de commandes shell à exécuter avant d'appeler Dpkg. Tout comme pour -Options, on doit utiliser la notation de liste. Les commandes sont appelées dans l'ordre, en utilisant -\fI/bin/sh\fR\ : APT s'arrête dès que l'une d'elles échoue. Sur l'entrée standard, APT transmet aux commandes les noms de tous les fichiers .deb qu'il va installer, à raison d'un par ligne. +.RS 4 +Il s\'agit d\'une liste de commandes shell à exécuter avant d\'appeler Dpkg\&. Tout comme pour +Options, on doit utiliser la notation de liste\&. Les commandes sont appelées dans l\'ordre, en utilisant +\fI/bin/sh\fR\ \&: APT s\'arrête dès que l\'une d\'elles échoue\&. Sur l\'entrée standard, APT transmet aux commandes les noms de tous les fichiers \&.deb qu\'il va installer, à raison d\'un par ligne\&. .sp -La deuxième version de ce protocole donne plus de renseignements\ : on obtient la version du protocole, la configuration de APT et les paquets, fichiers ou versions qui ont changé. On autorise cette version en positionnant +La deuxième version de ce protocole donne plus de renseignements\ \&: on obtient la version du protocole, la configuration de APT et les paquets, fichiers ou versions qui ont changé\&. On autorise cette version en positionnant DPkg::Tools::Options::cmd::Version -à 2. +à 2\&. cmd est une commande passée à -Pre\-Install\-Pkgs. +Pre\-Install\-Pkgs\&. .RE .PP Run\-Directory -.RS 3n -APT se place dans ce répertoire avant d'appeler Dpkg\ ; par défaut c'est le répertoire -\fI/\fR. +.RS 4 +APT se place dans ce répertoire avant d\'appeler Dpkg\ \&; par défaut c\'est le répertoire +\fI/\fR\&. .RE .PP Build\-Options -.RS 3n +.RS 4 Ces options sont passées à -\fBdpkg\-buildpackage\fR(1) -lors de la compilation des paquets\ ; par défaut la signature est désactivée et tous les binaires sont créés. +\fBdpkg-buildpackage\fR(1) +lors de la compilation des paquets\ \&; par défaut la signature est désactivée et tous les binaires sont créés\&. .RE .SH "LES OPTIONS DE DÉBOGAGE" .PP La plupart des options de la section debug -n'ont aucun intérêt pour le simple utilisateur\ ; cependant, +n\'ont aucun intérêt pour le simple utilisateur\ \&; cependant, Debug::pkgProblemResolver -affiche d'intéressantes informations sur les décisions que prend la commande dist\-upgrade. +affiche d\'intéressantes informations sur les décisions que prend la commande dist\-upgrade\&. Debug::NoLocking -désactive le verrouillage de fichier de manière à ce que APT puisse effectuer quelques opérations sans être \(Fo\ root\ \(Fc et +désactive le verrouillage de fichier de manière à ce que APT puisse effectuer quelques opérations sans être \(Fo\ \&root\ \&\(Fc et Debug::pkgDPkgPM -affiche la ligne de commande à chaque appel de Dpkg. +affiche la ligne de commande à chaque appel de Dpkg\&. Debug::IdentCdrom -désactive l'inclusion de données de type statfs dans les ID de CDROM. +désactive l\'inclusion de données de type statfs dans les ID de CDROM\&. Debug::Acquire::gpgv -Débogage de la méthode gpgv. +Débogage de la méthode gpgv\&. .SH "EXEMPLES" .PP Le fichier -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR -contient un modèle de fichier montrant les valeurs par défaut de toutes les options possibles. +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR +contient un modèle de fichier montrant les valeurs par défaut de toutes les options possibles\&. .SH "FICHIERS" .PP -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8), -\fBapt\-config\fR(8), -\fBapt_preferences\fR(5). +\fBapt-cache\fR(8), +\fBapt-config\fR(8), +\fBapt_preferences\fR(5)\&. .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Jérôme Marant. 2000\ ; mise à jour : Philippe Batailler. 2005. -. +Jérôme Marant\&. 2000\ \&; mise à jour : Philippe Batailler\&. 2005\&. +\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index d705b9e..6511004 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > diff --git a/doc/fr/apt_preferences.5 b/doc/fr/apt_preferences.5 index f443c99..8f1cc88 100644 --- a/doc/fr/apt_preferences.5 +++ b/doc/fr/apt_preferences.5 @@ -1,6 +1,6 @@ .\" Title: apt_preferences .\" Author: APT team -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -14,29 +14,29 @@ apt_preferences \- Un fichier de contrôle des préférences pour APT .SH "DESCRIPTION" .PP -Le fichier d'APT, -\fI/etc/apt/preferences\fR, peut être utilisé pour choisir la version des paquets que l'on veut installer. +Le fichier d\'APT, +\fI/etc/apt/preferences\fR, peut être utilisé pour choisir la version des paquets que l\'on veut installer\&. .PP Quand le fichier \fBsources.list\fR(5)contient des références à plusieurs distributions (par exemple, stable et -testing), plusieurs versions d'un paquet peuvent être installées. APT affecte une priorité à chaque version disponible. La commande -\fBapt\-get\fR, tenant compte des contraintes de dépendance, installe la version qui possède la priorité la plus haute. Le fichier des préférences annule les priorités assignées par défaut aux versions des paquets\ : ainsi l'utilisateur peut choisir la version qu'il veut installer. +testing), plusieurs versions d\'un paquet peuvent être installées\&. APT affecte une priorité à chaque version disponible\&. La commande +\fBapt\-get\fR, tenant compte des contraintes de dépendance, installe la version qui possède la priorité la plus haute\&. Le fichier des préférences annule les priorités assignées par défaut aux versions des paquets\ \&: ainsi l\'utilisateur peut choisir la version qu\'il veut installer\&. .PP Si le fichier -\fBsources.list\fR(5)contient, pour une même distribution, des références à plusieurs sites de téléchargement, il peut exister plusieurs exemplaires de la même version d'un paquet. Dans ce cas, +\fBsources.list\fR(5)contient, pour une même distribution, des références à plusieurs sites de téléchargement, il peut exister plusieurs exemplaires de la même version d\'un paquet\&. Dans ce cas, \fBapt\-get\fR -télécharge l'exemplaire qui apparaît en premier dans le fichier -\fBsources.list\fR(5). Le fichier des préférences n'influe pas sur le choix des exemplaires, seulement sur le choix de la version. +télécharge l\'exemplaire qui apparaît en premier dans le fichier +\fBsources.list\fR(5)\&. Le fichier des préférences n\'influe pas sur le choix des exemplaires, seulement sur le choix de la version\&. .SS "Les priorités affectées par défaut" .PP -Quand le fichier des préférences n'existe pas, ou quand aucune entrée de ce fichier ne s'applique à une version précise, la priorité affectée à cette version est la priorité de la distribution à laquelle elle appartient. On peut distinguer une distribution et lui donner une priorité plus haute que celle des autres distributions\ : on l'appelle la distribution par défaut ou \(Fo\ target release\ \(Fc et elle peut être définie sur la ligne de commande de +Quand le fichier des préférences n\'existe pas, ou quand aucune entrée de ce fichier ne s\'applique à une version précise, la priorité affectée à cette version est la priorité de la distribution à laquelle elle appartient\&. On peut distinguer une distribution et lui donner une priorité plus haute que celle des autres distributions\ \&: on l\'appelle la distribution par défaut ou \(Fo\ \&target release\ \&\(Fc et elle peut être définie sur la ligne de commande de \fBapt\-get\fR -ou dans le fichier de configuration d'APT, -\fI/etc/apt/apt.conf\fR. Par exemple\ : +ou dans le fichier de configuration d\'APT, +\fI/etc/apt/apt\&.conf\fR\&. Par exemple\ \&: .sp -.RS 3n +.RS 4 .nf \fBapt\-get install \-t testing \fR\fB\fIpaquet\fR\fR .fi @@ -44,96 +44,100 @@ ou dans le fichier de configuration d'APT, .sp .sp -.RS 3n +.RS 4 .nf APT::Default\-Release "stable"; .fi .RE -.sp .PP -Quand une distribution par défaut a été indiquée, APT utilise l'algorithme suivant pour déterminer la priorité des versions d'un paquet\ : +Quand une distribution par défaut a été indiquée, APT utilise l\'algorithme suivant pour déterminer la priorité des versions d\'un paquet\ \&: .PP une priorité égale à 100 -.RS 3n -est affectée à la version déjà installée (si elle existe). +.RS 4 +est affectée à la version déjà installée (si elle existe)\&. .RE .PP une priorité égale à 500 -.RS 3n -est affectée aux versions qui ne sont pas installées et qui n'appartiennent pas à la distribution par défaut. +.RS 4 +est affectée aux versions qui ne sont pas installées et qui n\'appartiennent pas à la distribution par défaut\&. .RE .PP une priorité égale à 990 -.RS 3n -est affectée aux versions qui ne sont pas installées et qui appartiennent à la distribution par défaut. -.RE -.PP -Quand aucune distribution par défaut n'a été indiquée, APT affecte simplement une priorité égale à 100 à toute version installée d'un paquet et une priorité égale à 500 à tout version non installée. -.PP -Puis APT applique les règles suivantes pour déterminer la version du paquet qu'il faut installer (elles sont listées par ordre de priorité)\ : -.TP 3n -\(bu -Ne jamais revenir en arrière, sauf si la priorité d'une version disponible dépasse 1000. \(Fo\ Revenir en arrière\ \(Fc signifie installer une version moins récente que la version installée. Il faut noter qu'aucune des priorités par défaut n'excède 1000\ ; de telles valeurs ne peuvent être définies que dans le fichier des préférences. Notez aussi qu'il est risqué de revenir en arrière. -.TP 3n -\(bu -Installer la version qui possède la priorité la plus haute. -.TP 3n -\(bu -Quand deux (ou plus) versions ont la même priorité, installer la version la plus récente (c.\-à\-d. celle dont le numéro de version est le plus grand). -.TP 3n -\(bu -Quand deux (ou plus) versions ont la même priorité et le même numéro de version, mais soit les paquets diffèrent par certaines métadonnées, soit l'option +.RS 4 +est affectée aux versions qui ne sont pas installées et qui appartiennent à la distribution par défaut\&. +.RE +.PP +Quand aucune distribution par défaut n\'a été indiquée, APT affecte simplement une priorité égale à 100 à toute version installée d\'un paquet et une priorité égale à 500 à tout version non installée\&. +.PP +Puis APT applique les règles suivantes pour déterminer la version du paquet qu\'il faut installer (elles sont listées par ordre de priorité)\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ne jamais revenir en arrière, sauf si la priorité d\'une version disponible dépasse 1000\&. \(Fo\ \&Revenir en arrière\ \&\(Fc signifie installer une version moins récente que la version installée\&. Il faut noter qu\'aucune des priorités par défaut n\'excède 1000\ \&; de telles valeurs ne peuvent être définies que dans le fichier des préférences\&. Notez aussi qu\'il est risqué de revenir en arrière\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Installer la version qui possède la priorité la plus haute\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Quand deux (ou plus) versions ont la même priorité, installer la version la plus récente (c\&.\-à\-d\&. celle dont le numéro de version est le plus grand)\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Quand deux (ou plus) versions ont la même priorité et le même numéro de version, mais soit les paquets diffèrent par certaines métadonnées, soit l\'option \-\-reinstall -a été donnée, installer la version qui n'est pas installée. +a été donnée, installer la version qui n\'est pas installée\&. +.RE .sp .RE .PP -En général, la version installée d'un paquet (priorité 100) n'est pas aussi récente que les versions disponibles dans les sources listées dans le fichier -\fBsources.list\fR(5)(priorité 500 ou 990). Et donc le paquet sera mis à niveau avec la commande\ : +En général, la version installée d\'un paquet (priorité 100) n\'est pas aussi récente que les versions disponibles dans les sources listées dans le fichier +\fBsources.list\fR(5)(priorité 500 ou 990)\&. Et donc le paquet sera mis à niveau avec la commande\ \&: \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou -\fBapt\-get dist\-upgrade\fR. +\fBapt\-get dist\-upgrade\fR\&. .PP -La version installée d'un paquet peut être \- rarement \- +La version installée d\'un paquet peut être \- rarement \- \fIplus\fR -récente que tout autre version disponible. Les commandes +récente que tout autre version disponible\&. Les commandes \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou \fBapt\-get upgrade\fR -ne provoquent pas de retour en arrière. +ne provoquent pas de retour en arrière\&. .PP -Parfois, la version installée d'un paquet est plus récente que la version appartenant à la distribution par défaut, mais moins récente que la version appartenant à une autre distribution. Une telle version sera mise à niveau par les commandes +Parfois, la version installée d\'un paquet est plus récente que la version appartenant à la distribution par défaut, mais moins récente que la version appartenant à une autre distribution\&. Une telle version sera mise à niveau par les commandes \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou \fBapt\-get upgrade\fR car au moins -\fIl'une\fR -des versions disponibles possède une plus haute priorité que celle de la version installée. +\fIl\'une\fR +des versions disponibles possède une plus haute priorité que celle de la version installée\&. .SS "Conséquences des préférences" .PP -Le fichier des préférences permet à l'administrateur système de contrôler l'affectation des priorités. Ce fichier est constitué d'une ou plusieurs entrées séparées par des lignes blanches. Ces entrées peuvent avoir deux formes, une forme particulière et une forme générale. -.TP 3n -\(bu -La forme particulière affecte une priorité (\fIPin\-Priority\fR) à un paquet précis, à une version précise ou à un intervalle spécifiant plusieurs versions. Par exemple, l'entrée suivante affecte une priorité haute à toutes les versions du paquet +Le fichier des préférences permet à l\'administrateur système de contrôler l\'affectation des priorités\&. Ce fichier est constitué d\'une ou plusieurs entrées séparées par des lignes blanches\&. Ces entrées peuvent avoir deux formes, une forme particulière et une forme générale\&. +.sp +.RS 4 +\h'-04'\(bu\h'+03'La forme particulière affecte une priorité (\fIPin\-Priority\fR) à un paquet précis, à une version précise ou à un intervalle spécifiant plusieurs versions\&. Par exemple, l\'entrée suivante affecte une priorité haute à toutes les versions du paquet \fIperl\fR dont le numéro de version commence par -5.8. +5\&.8\&. .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 .fi .RE -.TP 3n -\(bu -La forme générale affecte une priorité à toutes les versions d'un paquet dans une distribution donnée (c'est\-à\-dire, à toutes les versions d'un paquet qui sont listées dans un fichier -\fIRelease\fR), ou à toutes les versions d'un paquet provenant d'un site internet identifié par un nom complètement qualifié. +.RE .sp -Cette forme générale des entrées du fichier des préférences s'applique seulement aux groupes de paquets. Par exemple, l'entrée suivante affecte une priorité haute à toutes les versions disponibles dans le site local. +.RS 4 +\h'-04'\(bu\h'+03'La forme générale affecte une priorité à toutes les versions d\'un paquet dans une distribution donnée (c\'est\-à\-dire, à toutes les versions d\'un paquet qui sont listées dans un fichier +\fIRelease\fR), ou à toutes les versions d\'un paquet provenant d\'un site internet identifié par un nom complètement qualifié\&. .sp -.RS 3n +Cette forme générale des entrées du fichier des préférences s\'applique seulement aux groupes de paquets\&. Par exemple, l\'entrée suivante affecte une priorité haute à toutes les versions disponibles dans le site local\&. +.sp +.RS 4 .nf Package: * Pin: origin "" @@ -141,77 +145,78 @@ Pin\-Priority: 999 .fi .RE Attention ! le mot\-clé utilisé ici, -origin, ne doit pas être confondu avec l'Origine d'une distribution indiquée dans un fichier -\fIRelease\fR. Ce qui suit l'étiquette \(Fo\ Origin:\ \(Fc dans un fichier +origin, ne doit pas être confondu avec l\'Origine d\'une distribution indiquée dans un fichier +\fIRelease\fR\&. Ce qui suit l\'étiquette \(Fo\ \&Origin:\ \&\(Fc dans un fichier \fIRelease\fR -n'est pas une adresse internet mais le nom d'un auteur ou d'un distributeur, comme Debian ou Ximian. +n\'est pas une adresse internet mais le nom d\'un auteur ou d\'un distributeur, comme Debian ou Ximian\&. .sp -L'entrée suivante affecte une priorité basse à toutes les versions d'un paquet appartenant à toute distribution dont le nom d'\(Fo\ Archive\ \(Fc est -unstable. +L\'entrée suivante affecte une priorité basse à toutes les versions d\'un paquet appartenant à toute distribution dont le nom d\'\(Fo\ \&Archive\ \&\(Fc est +unstable\&. .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=unstable Pin\-Priority: 50 .fi .RE -L'entrée suivante affecte une priorité haute à toutes les versions d'un paquet appartenant à toute distribution dont le nom d'\(Fo\ Archive\ \(Fc est +L\'entrée suivante affecte une priorité haute à toutes les versions d\'un paquet appartenant à toute distribution dont le nom d\'\(Fo\ \&Archive\ \&\(Fc est stable -et dont le numéro de \(Fo\ Version\ \(Fc est -3.0. +et dont le numéro de \(Fo\ \&Version\ \&\(Fc est +3\&.0\&. .sp -.RS 3n +.RS 4 .nf Package: * -Pin: release a=stable, v=3.0 +Pin: release a=stable, v=3\&.0 Pin\-Priority: 500 .fi .RE +.RE .sp .RE -.SS "Comment APT interprète\-t\-il les priorités\ ?" +.SS "Comment APT interprète\-t\-il les priorités\ \&?" .PP -Les priorités (P) indiquées dans le fichier des préférences doivent être des entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit\ : +Les priorités (P) indiquées dans le fichier des préférences doivent être des entiers positifs ou négatifs\&. Ils sont interprétés à peu près comme suit\ \&: .PP P > 1000 -.RS 3n -Cette priorité entraîne l'installation du paquet même s'il s'agit d'un retour en arrière. +.RS 4 +Cette priorité entraîne l\'installation du paquet même s\'il s\'agit d\'un retour en arrière\&. .RE .PP 990 < P <=1000 -.RS 3n -La version sera installée, même si elle n'appartient pas à la distribution par défaut\ ; mais elle ne sera pas installée si la version installée est plus récente. +.RS 4 +La version sera installée, même si elle n\'appartient pas à la distribution par défaut\ \&; mais elle ne sera pas installée si la version installée est plus récente\&. .RE .PP 500 < P <=990 -.RS 3n -La version sera installée, sauf s'il existe une version appartenant à la distribution par défaut ou si la version installée est plus récente. +.RS 4 +La version sera installée, sauf s\'il existe une version appartenant à la distribution par défaut ou si la version installée est plus récente\&. .RE .PP 100 < P <=500 -.RS 3n -La version sera installée, sauf s'il existe une version appartenant à une autre distribution ou si la version installée est plus récente. +.RS 4 +La version sera installée, sauf s\'il existe une version appartenant à une autre distribution ou si la version installée est plus récente\&. .RE .PP 0 < P <=100 -.RS 3n -La version sera installée si aucune version du paquet n'est installée. +.RS 4 +La version sera installée si aucune version du paquet n\'est installée\&. .RE .PP P < 0 -.RS 3n -Cette priorité empêche l'installation de la version. +.RS 4 +Cette priorité empêche l\'installation de la version\&. .RE .PP -Si l'une des entrées de forme particulière correspond à la version disponible d'un paquet, la première entrée trouvée détermine la priorité de cette version. S'il n'en existe pas, et si l'une des entrées de forme générale correspond à la version disponible d'un paquet, la première entrée trouvée détermine la priorité. +Si l\'une des entrées de forme particulière correspond à la version disponible d\'un paquet, la première entrée trouvée détermine la priorité de cette version\&. S\'il n\'en existe pas, et si l\'une des entrées de forme générale correspond à la version disponible d\'un paquet, la première entrée trouvée détermine la priorité\&. .PP -Supposons par exemple que le fichier des préférences contienne les trois entrées décrites ci\-dessous\ : +Supposons par exemple que le fichier des préférences contienne les trois entrées décrites ci\-dessous\ \&: .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 Package: * @@ -224,23 +229,26 @@ Pin\-Priority: 50 .fi .RE .PP -Alors\ : -.TP 3n -\(bu -La version la plus récente du paquet +Alors\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'La version la plus récente du paquet perl sera installé pour autant que son numéro de version commence par -5.8. Si l'\fIune\fR -des versions 5.8* existe et si la version installée est une version 5.9*, il y aura un retour en arrière. -.TP 3n -\(bu -Les versions des paquets (autres que -perl) disponibles dans le site local ont priorité sur les autres versions, même celles appartenant à la distribution par défaut. -.TP 3n -\(bu -La version d'un paquet dont l'origine n'est pas le site local mais un site internet listé dans +5\&.8\&. Si l\'\fIune\fR +des versions 5\&.8* existe et si la version installée est une version 5\&.9*, il y aura un retour en arrière\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Les versions des paquets (autres que +perl) disponibles dans le site local ont priorité sur les autres versions, même celles appartenant à la distribution par défaut\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'La version d\'un paquet dont l\'origine n\'est pas le site local mais un site internet listé dans \fBsources.list\fR(5)et qui appartient à une distribution -unstable, ne sera installée que si aucune version du paquet n'est déjà installée. +unstable, ne sera installée que si aucune version du paquet n\'est déjà installée\&. +.RE .sp .RE .SS "Détermination de la version des paquets et des propriétés des distributions" @@ -250,46 +258,46 @@ Chaque source list \fIPackages\fR et \fIRelease\fR -qui décrivent les paquets disponibles à cet endroit. +qui décrivent les paquets disponibles à cet endroit\&. .PP Le fichier \fIPackages\fR se trouve normalement dans le répertoire -\fI.../dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR, par exemple, -\fI.../dists/stable/main/binary\-i386/Packages\fR. Il consiste en entrées composées de lignes, une pour chaque paquet disponible dans le répertoire. Seules deux lignes des entrées sont pertinentes pour la détermination des priorités\ : +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR, par exemple, +\fI\&.\&.\&./dists/stable/main/binary\-i386/Packages\fR\&. Il consiste en entrées composées de lignes, une pour chaque paquet disponible dans le répertoire\&. Seules deux lignes des entrées sont pertinentes pour la détermination des priorités\ \&: .PP La ligne Package: -.RS 3n +.RS 4 donne le nom du paquet .RE .PP La ligne Version: -.RS 3n +.RS 4 donne le numéro de version du paquet .RE .PP Le fichier \fIRelease\fR se trouve normalement dans le répertoire -\fI.../dists/\fR\fI\fIdist\-name\fR\fR, par exemple, -\fI.../dists/stable/Release\fR, ou -\fI.../dists/woody/Release\fR. Il consiste en une seule entrée composée de plusieurs lignes qui s'applique à +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR, par exemple, +\fI\&.\&.\&./dists/stable/Release\fR, ou +\fI\&.\&.\&./dists/woody/Release\fR\&. Il consiste en une seule entrée composée de plusieurs lignes qui s\'applique à \fItous\fR -les paquets situés dans les répertoires sous le répertoire parent. Contrairement au fichier +les paquets situés dans les répertoires sous le répertoire parent\&. Contrairement au fichier \fIPackages\fR, presque toutes les lignes du fichier \fIRelease\fR -sont pertinentes pour déterminer les priorités\ : +sont pertinentes pour déterminer les priorités\ \&: .PP La ligne Archive: -.RS 3n -nomme l'archive à laquelle appartiennent tous les paquets situés dans les répertoires. Par exemple, la ligne +.RS 4 +nomme l\'archive à laquelle appartiennent tous les paquets situés dans les répertoires\&. Par exemple, la ligne Archive: stable indique que tous les paquets dans les répertoires situés sous le répertoire parent du fichier \fIRelease\fR -appartiennent à l'archive -stable. Indiquer cette valeur dans le fichier des préférences demanderait cette ligne\ : +appartiennent à l\'archive +stable\&. Indiquer cette valeur dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release a=stable .fi @@ -297,31 +305,31 @@ Pin: release a=stable .RE .PP La ligne Version: -.RS 3n -indique la version de la distribution. Par exemple, les paquets dans les répertoires peuvent appartenir à la distribution Debian GNU/Linux version 3.0. Il n'y a pas de numéro de version pour les distributions +.RS 4 +indique la version de la distribution\&. Par exemple, les paquets dans les répertoires peuvent appartenir à la distribution Debian GNU/Linux version 3\&.0\&. Il n\'y a pas de numéro de version pour les distributions testing et unstable -car elles n'ont pas encore été publiées. Indiquer cette valeur dans le fichier des préférences demanderait ces lignes\ : +car elles n\'ont pas encore été publiées\&. Indiquer cette valeur dans le fichier des préférences demanderait ces lignes\ \&: .sp -.RS 3n +.RS 4 .nf -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 +Pin: release v=3\&.0 +Pin: release a=stable, v=3\&.0 +Pin: release 3\&.0 .fi .RE .RE .PP La ligne Component: -.RS 3n +.RS 4 nomme un composant qui indique le type de licence associée aux paquets situés dans les répertoires sous le fichier -\fIRelease\fR. Par exemple, la ligne +\fIRelease\fR\&. Par exemple, la ligne Component: main indique que tous les exemplaires dans les répertoires appartiennent au composant -main, c'est\-à\-dire que leur licence est en accord avec les Directives Debian pour le logiciel libre. Indiquer ce composant dans le fichier des préférences demanderait cette ligne\ : +main, c\'est\-à\-dire que leur licence est en accord avec les Directives Debian pour le logiciel libre\&. Indiquer ce composant dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release c=main .fi @@ -329,12 +337,12 @@ Pin: release c=main .RE .PP La ligne Origin: -.RS 3n -nomme l'origine des paquets situés dans les répertoires sous le fichier -\fIRelease\fR. En général, c'est -Debian. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ : +.RS 4 +nomme l\'origine des paquets situés dans les répertoires sous le fichier +\fIRelease\fR\&. En général, c\'est +Debian\&. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release o=Debian .fi @@ -342,12 +350,12 @@ Pin: release o=Debian .RE .PP La ligne Label: -.RS 3n +.RS 4 indique un label pour les paquets qui se trouvent dans les répertoires sous le fichier -\fIRelease\fR. En général, c'est -Debian. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ : +\fIRelease\fR\&. En général, c\'est +Debian\&. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release l=Debian .fi @@ -364,37 +372,37 @@ r ou dans le fichier spécifié par la variable Dir::State::Lists dans le fichier -\fIapt.conf\fR. Par exemple, le fichier -\fIdebian.lcs.mit.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR +\fIapt\&.conf\fR\&. Par exemple, le fichier +\fIdebian\&.lcs\&.mit\&.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR contient le fichier \fIRelease\fR du site -debian.lcs.mit.edu, architecture +debian\&.lcs\&.mit\&.edu, architecture binary\-i386 et composant contrib de la distribution -unstable. +unstable\&. .SS "Lignes facultatives dans le fichier des préférences" .PP Toute entrée du fichier des préférences peut commencer par une ou plusieurs lignes contenant le mot -Explanation:. Cela permet des commentaires. +Explanation:\&. Cela permet des commentaires\&. .PP La ligne Pin\-Priority: -d'une entrée est facultative. Si elle n'existe pas, APT affecte une priorité inférieure de 1 à la valeur spécifiée sur une ligne commençant par -Pin\-Priority: release .... +d\'une entrée est facultative\&. Si elle n\'existe pas, APT affecte une priorité inférieure de 1 à la valeur spécifiée sur une ligne commençant par +Pin\-Priority: release \&.\&.\&.\&. .SH "EXEMPLES" -.SS "Comment suivre Stable\ ?" +.SS "Comment suivre Stable\ \&?" .PP Le fichier des préférences suivant affecte une priorité plus haute que la priorité par défaut (500) à tous les exemplaires appartenant à la distribution stable -et une priorité prohibitivement basse à tous les exemplaires appartenant à d'autres distributions -Debian. +et une priorité prohibitivement basse à tous les exemplaires appartenant à d\'autres distributions +Debian\&. .sp -.RS 3n +.RS 4 .nf -Explanation: Ne pas installer des exemplaires d'origine Debian +Explanation: Ne pas installer des exemplaires d\'origine Debian Explanation: sauf ceux de la distribution stable Package: * Pin: release a=stable @@ -405,41 +413,39 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP Avec le fichier des préférences ci\-dessus et un fichier \fBsources.list\fR(5)adéquat, les commandes suivantes utiliseront les versions les plus récentes de stable -pour faire la mise à niveau\ : +pour faire la mise à niveau\ \&: .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP La commande suivante utilisera la version la plus récente de la distribution testing -pour mettre à niveau le paquet spécifié\ ; cependant les mises à niveau ultérieures du paquet ne se feront pas à moins de relancer la commande. +pour mettre à niveau le paquet spécifié\ \&; cependant les mises à niveau ultérieures du paquet ne se feront pas à moins de relancer la commande\&. .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR/testing .fi .RE .sp -.SS "Comment suivre Testing ou Unstable\ ?" +.SS "Comment suivre Testing ou Unstable\ \&?" .PP Le fichier des préférences suivant affecte une priorité haute aux versions des paquets appartenant à la distribution testing, une priorité moindre aux versions appartenant à la distribution unstable -et une priorité prohibitivement basse aux versions appartenant à d'autres distributions -Debian. +et une priorité prohibitivement basse aux versions appartenant à d\'autres distributions +Debian\&. .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=testing @@ -454,33 +460,31 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP Avec un fichier \fBsources.list\fR(5)approprié et le fichier des préférences ci\-dessus, les commandes suivantes utiliseront les versions les plus récentes de testing -pour faire la mise à niveau\ : +pour faire la mise à niveau\ \&: .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP La commande suivante utilisera la version la plus récente de la distribution unstable -pour mettre à niveau le paquet spécifié\ ; Par la suite, +pour mettre à niveau le paquet spécifié\ \&; Par la suite, \fBapt\-get upgrade\fR mettra le paquet à jour avec la plus récente version dans testing si elle est plus récente que la version installée ou avec la plus récente version dans unstable -si elle est plus récente que la version installée. +si elle est plus récente que la version installée\&. .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR/unstable .fi @@ -489,28 +493,30 @@ apt\-get install \fIpaquet\fR/unstable .SH "SEE ALSO" .PP -\fBapt\-get\fR(8) -\fBapt\-cache\fR(8) +\fBapt-get\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) \fBsources.list\fR(5) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/apt_preferences.fr.5 b/doc/fr/apt_preferences.fr.5 index f443c99..8f1cc88 100644 --- a/doc/fr/apt_preferences.fr.5 +++ b/doc/fr/apt_preferences.fr.5 @@ -1,6 +1,6 @@ .\" Title: apt_preferences .\" Author: APT team -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 Février 2004 .\" Manual: .\" Source: Linux @@ -14,29 +14,29 @@ apt_preferences \- Un fichier de contrôle des préférences pour APT .SH "DESCRIPTION" .PP -Le fichier d'APT, -\fI/etc/apt/preferences\fR, peut être utilisé pour choisir la version des paquets que l'on veut installer. +Le fichier d\'APT, +\fI/etc/apt/preferences\fR, peut être utilisé pour choisir la version des paquets que l\'on veut installer\&. .PP Quand le fichier \fBsources.list\fR(5)contient des références à plusieurs distributions (par exemple, stable et -testing), plusieurs versions d'un paquet peuvent être installées. APT affecte une priorité à chaque version disponible. La commande -\fBapt\-get\fR, tenant compte des contraintes de dépendance, installe la version qui possède la priorité la plus haute. Le fichier des préférences annule les priorités assignées par défaut aux versions des paquets\ : ainsi l'utilisateur peut choisir la version qu'il veut installer. +testing), plusieurs versions d\'un paquet peuvent être installées\&. APT affecte une priorité à chaque version disponible\&. La commande +\fBapt\-get\fR, tenant compte des contraintes de dépendance, installe la version qui possède la priorité la plus haute\&. Le fichier des préférences annule les priorités assignées par défaut aux versions des paquets\ \&: ainsi l\'utilisateur peut choisir la version qu\'il veut installer\&. .PP Si le fichier -\fBsources.list\fR(5)contient, pour une même distribution, des références à plusieurs sites de téléchargement, il peut exister plusieurs exemplaires de la même version d'un paquet. Dans ce cas, +\fBsources.list\fR(5)contient, pour une même distribution, des références à plusieurs sites de téléchargement, il peut exister plusieurs exemplaires de la même version d\'un paquet\&. Dans ce cas, \fBapt\-get\fR -télécharge l'exemplaire qui apparaît en premier dans le fichier -\fBsources.list\fR(5). Le fichier des préférences n'influe pas sur le choix des exemplaires, seulement sur le choix de la version. +télécharge l\'exemplaire qui apparaît en premier dans le fichier +\fBsources.list\fR(5)\&. Le fichier des préférences n\'influe pas sur le choix des exemplaires, seulement sur le choix de la version\&. .SS "Les priorités affectées par défaut" .PP -Quand le fichier des préférences n'existe pas, ou quand aucune entrée de ce fichier ne s'applique à une version précise, la priorité affectée à cette version est la priorité de la distribution à laquelle elle appartient. On peut distinguer une distribution et lui donner une priorité plus haute que celle des autres distributions\ : on l'appelle la distribution par défaut ou \(Fo\ target release\ \(Fc et elle peut être définie sur la ligne de commande de +Quand le fichier des préférences n\'existe pas, ou quand aucune entrée de ce fichier ne s\'applique à une version précise, la priorité affectée à cette version est la priorité de la distribution à laquelle elle appartient\&. On peut distinguer une distribution et lui donner une priorité plus haute que celle des autres distributions\ \&: on l\'appelle la distribution par défaut ou \(Fo\ \&target release\ \&\(Fc et elle peut être définie sur la ligne de commande de \fBapt\-get\fR -ou dans le fichier de configuration d'APT, -\fI/etc/apt/apt.conf\fR. Par exemple\ : +ou dans le fichier de configuration d\'APT, +\fI/etc/apt/apt\&.conf\fR\&. Par exemple\ \&: .sp -.RS 3n +.RS 4 .nf \fBapt\-get install \-t testing \fR\fB\fIpaquet\fR\fR .fi @@ -44,96 +44,100 @@ ou dans le fichier de configuration d'APT, .sp .sp -.RS 3n +.RS 4 .nf APT::Default\-Release "stable"; .fi .RE -.sp .PP -Quand une distribution par défaut a été indiquée, APT utilise l'algorithme suivant pour déterminer la priorité des versions d'un paquet\ : +Quand une distribution par défaut a été indiquée, APT utilise l\'algorithme suivant pour déterminer la priorité des versions d\'un paquet\ \&: .PP une priorité égale à 100 -.RS 3n -est affectée à la version déjà installée (si elle existe). +.RS 4 +est affectée à la version déjà installée (si elle existe)\&. .RE .PP une priorité égale à 500 -.RS 3n -est affectée aux versions qui ne sont pas installées et qui n'appartiennent pas à la distribution par défaut. +.RS 4 +est affectée aux versions qui ne sont pas installées et qui n\'appartiennent pas à la distribution par défaut\&. .RE .PP une priorité égale à 990 -.RS 3n -est affectée aux versions qui ne sont pas installées et qui appartiennent à la distribution par défaut. -.RE -.PP -Quand aucune distribution par défaut n'a été indiquée, APT affecte simplement une priorité égale à 100 à toute version installée d'un paquet et une priorité égale à 500 à tout version non installée. -.PP -Puis APT applique les règles suivantes pour déterminer la version du paquet qu'il faut installer (elles sont listées par ordre de priorité)\ : -.TP 3n -\(bu -Ne jamais revenir en arrière, sauf si la priorité d'une version disponible dépasse 1000. \(Fo\ Revenir en arrière\ \(Fc signifie installer une version moins récente que la version installée. Il faut noter qu'aucune des priorités par défaut n'excède 1000\ ; de telles valeurs ne peuvent être définies que dans le fichier des préférences. Notez aussi qu'il est risqué de revenir en arrière. -.TP 3n -\(bu -Installer la version qui possède la priorité la plus haute. -.TP 3n -\(bu -Quand deux (ou plus) versions ont la même priorité, installer la version la plus récente (c.\-à\-d. celle dont le numéro de version est le plus grand). -.TP 3n -\(bu -Quand deux (ou plus) versions ont la même priorité et le même numéro de version, mais soit les paquets diffèrent par certaines métadonnées, soit l'option +.RS 4 +est affectée aux versions qui ne sont pas installées et qui appartiennent à la distribution par défaut\&. +.RE +.PP +Quand aucune distribution par défaut n\'a été indiquée, APT affecte simplement une priorité égale à 100 à toute version installée d\'un paquet et une priorité égale à 500 à tout version non installée\&. +.PP +Puis APT applique les règles suivantes pour déterminer la version du paquet qu\'il faut installer (elles sont listées par ordre de priorité)\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ne jamais revenir en arrière, sauf si la priorité d\'une version disponible dépasse 1000\&. \(Fo\ \&Revenir en arrière\ \&\(Fc signifie installer une version moins récente que la version installée\&. Il faut noter qu\'aucune des priorités par défaut n\'excède 1000\ \&; de telles valeurs ne peuvent être définies que dans le fichier des préférences\&. Notez aussi qu\'il est risqué de revenir en arrière\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Installer la version qui possède la priorité la plus haute\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Quand deux (ou plus) versions ont la même priorité, installer la version la plus récente (c\&.\-à\-d\&. celle dont le numéro de version est le plus grand)\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Quand deux (ou plus) versions ont la même priorité et le même numéro de version, mais soit les paquets diffèrent par certaines métadonnées, soit l\'option \-\-reinstall -a été donnée, installer la version qui n'est pas installée. +a été donnée, installer la version qui n\'est pas installée\&. +.RE .sp .RE .PP -En général, la version installée d'un paquet (priorité 100) n'est pas aussi récente que les versions disponibles dans les sources listées dans le fichier -\fBsources.list\fR(5)(priorité 500 ou 990). Et donc le paquet sera mis à niveau avec la commande\ : +En général, la version installée d\'un paquet (priorité 100) n\'est pas aussi récente que les versions disponibles dans les sources listées dans le fichier +\fBsources.list\fR(5)(priorité 500 ou 990)\&. Et donc le paquet sera mis à niveau avec la commande\ \&: \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou -\fBapt\-get dist\-upgrade\fR. +\fBapt\-get dist\-upgrade\fR\&. .PP -La version installée d'un paquet peut être \- rarement \- +La version installée d\'un paquet peut être \- rarement \- \fIplus\fR -récente que tout autre version disponible. Les commandes +récente que tout autre version disponible\&. Les commandes \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou \fBapt\-get upgrade\fR -ne provoquent pas de retour en arrière. +ne provoquent pas de retour en arrière\&. .PP -Parfois, la version installée d'un paquet est plus récente que la version appartenant à la distribution par défaut, mais moins récente que la version appartenant à une autre distribution. Une telle version sera mise à niveau par les commandes +Parfois, la version installée d\'un paquet est plus récente que la version appartenant à la distribution par défaut, mais moins récente que la version appartenant à une autre distribution\&. Une telle version sera mise à niveau par les commandes \fBapt\-get install \fR\fB\fIpaquet\fR\fR ou \fBapt\-get upgrade\fR car au moins -\fIl'une\fR -des versions disponibles possède une plus haute priorité que celle de la version installée. +\fIl\'une\fR +des versions disponibles possède une plus haute priorité que celle de la version installée\&. .SS "Conséquences des préférences" .PP -Le fichier des préférences permet à l'administrateur système de contrôler l'affectation des priorités. Ce fichier est constitué d'une ou plusieurs entrées séparées par des lignes blanches. Ces entrées peuvent avoir deux formes, une forme particulière et une forme générale. -.TP 3n -\(bu -La forme particulière affecte une priorité (\fIPin\-Priority\fR) à un paquet précis, à une version précise ou à un intervalle spécifiant plusieurs versions. Par exemple, l'entrée suivante affecte une priorité haute à toutes les versions du paquet +Le fichier des préférences permet à l\'administrateur système de contrôler l\'affectation des priorités\&. Ce fichier est constitué d\'une ou plusieurs entrées séparées par des lignes blanches\&. Ces entrées peuvent avoir deux formes, une forme particulière et une forme générale\&. +.sp +.RS 4 +\h'-04'\(bu\h'+03'La forme particulière affecte une priorité (\fIPin\-Priority\fR) à un paquet précis, à une version précise ou à un intervalle spécifiant plusieurs versions\&. Par exemple, l\'entrée suivante affecte une priorité haute à toutes les versions du paquet \fIperl\fR dont le numéro de version commence par -5.8. +5\&.8\&. .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 .fi .RE -.TP 3n -\(bu -La forme générale affecte une priorité à toutes les versions d'un paquet dans une distribution donnée (c'est\-à\-dire, à toutes les versions d'un paquet qui sont listées dans un fichier -\fIRelease\fR), ou à toutes les versions d'un paquet provenant d'un site internet identifié par un nom complètement qualifié. +.RE .sp -Cette forme générale des entrées du fichier des préférences s'applique seulement aux groupes de paquets. Par exemple, l'entrée suivante affecte une priorité haute à toutes les versions disponibles dans le site local. +.RS 4 +\h'-04'\(bu\h'+03'La forme générale affecte une priorité à toutes les versions d\'un paquet dans une distribution donnée (c\'est\-à\-dire, à toutes les versions d\'un paquet qui sont listées dans un fichier +\fIRelease\fR), ou à toutes les versions d\'un paquet provenant d\'un site internet identifié par un nom complètement qualifié\&. .sp -.RS 3n +Cette forme générale des entrées du fichier des préférences s\'applique seulement aux groupes de paquets\&. Par exemple, l\'entrée suivante affecte une priorité haute à toutes les versions disponibles dans le site local\&. +.sp +.RS 4 .nf Package: * Pin: origin "" @@ -141,77 +145,78 @@ Pin\-Priority: 999 .fi .RE Attention ! le mot\-clé utilisé ici, -origin, ne doit pas être confondu avec l'Origine d'une distribution indiquée dans un fichier -\fIRelease\fR. Ce qui suit l'étiquette \(Fo\ Origin:\ \(Fc dans un fichier +origin, ne doit pas être confondu avec l\'Origine d\'une distribution indiquée dans un fichier +\fIRelease\fR\&. Ce qui suit l\'étiquette \(Fo\ \&Origin:\ \&\(Fc dans un fichier \fIRelease\fR -n'est pas une adresse internet mais le nom d'un auteur ou d'un distributeur, comme Debian ou Ximian. +n\'est pas une adresse internet mais le nom d\'un auteur ou d\'un distributeur, comme Debian ou Ximian\&. .sp -L'entrée suivante affecte une priorité basse à toutes les versions d'un paquet appartenant à toute distribution dont le nom d'\(Fo\ Archive\ \(Fc est -unstable. +L\'entrée suivante affecte une priorité basse à toutes les versions d\'un paquet appartenant à toute distribution dont le nom d\'\(Fo\ \&Archive\ \&\(Fc est +unstable\&. .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=unstable Pin\-Priority: 50 .fi .RE -L'entrée suivante affecte une priorité haute à toutes les versions d'un paquet appartenant à toute distribution dont le nom d'\(Fo\ Archive\ \(Fc est +L\'entrée suivante affecte une priorité haute à toutes les versions d\'un paquet appartenant à toute distribution dont le nom d\'\(Fo\ \&Archive\ \&\(Fc est stable -et dont le numéro de \(Fo\ Version\ \(Fc est -3.0. +et dont le numéro de \(Fo\ \&Version\ \&\(Fc est +3\&.0\&. .sp -.RS 3n +.RS 4 .nf Package: * -Pin: release a=stable, v=3.0 +Pin: release a=stable, v=3\&.0 Pin\-Priority: 500 .fi .RE +.RE .sp .RE -.SS "Comment APT interprète\-t\-il les priorités\ ?" +.SS "Comment APT interprète\-t\-il les priorités\ \&?" .PP -Les priorités (P) indiquées dans le fichier des préférences doivent être des entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit\ : +Les priorités (P) indiquées dans le fichier des préférences doivent être des entiers positifs ou négatifs\&. Ils sont interprétés à peu près comme suit\ \&: .PP P > 1000 -.RS 3n -Cette priorité entraîne l'installation du paquet même s'il s'agit d'un retour en arrière. +.RS 4 +Cette priorité entraîne l\'installation du paquet même s\'il s\'agit d\'un retour en arrière\&. .RE .PP 990 < P <=1000 -.RS 3n -La version sera installée, même si elle n'appartient pas à la distribution par défaut\ ; mais elle ne sera pas installée si la version installée est plus récente. +.RS 4 +La version sera installée, même si elle n\'appartient pas à la distribution par défaut\ \&; mais elle ne sera pas installée si la version installée est plus récente\&. .RE .PP 500 < P <=990 -.RS 3n -La version sera installée, sauf s'il existe une version appartenant à la distribution par défaut ou si la version installée est plus récente. +.RS 4 +La version sera installée, sauf s\'il existe une version appartenant à la distribution par défaut ou si la version installée est plus récente\&. .RE .PP 100 < P <=500 -.RS 3n -La version sera installée, sauf s'il existe une version appartenant à une autre distribution ou si la version installée est plus récente. +.RS 4 +La version sera installée, sauf s\'il existe une version appartenant à une autre distribution ou si la version installée est plus récente\&. .RE .PP 0 < P <=100 -.RS 3n -La version sera installée si aucune version du paquet n'est installée. +.RS 4 +La version sera installée si aucune version du paquet n\'est installée\&. .RE .PP P < 0 -.RS 3n -Cette priorité empêche l'installation de la version. +.RS 4 +Cette priorité empêche l\'installation de la version\&. .RE .PP -Si l'une des entrées de forme particulière correspond à la version disponible d'un paquet, la première entrée trouvée détermine la priorité de cette version. S'il n'en existe pas, et si l'une des entrées de forme générale correspond à la version disponible d'un paquet, la première entrée trouvée détermine la priorité. +Si l\'une des entrées de forme particulière correspond à la version disponible d\'un paquet, la première entrée trouvée détermine la priorité de cette version\&. S\'il n\'en existe pas, et si l\'une des entrées de forme générale correspond à la version disponible d\'un paquet, la première entrée trouvée détermine la priorité\&. .PP -Supposons par exemple que le fichier des préférences contienne les trois entrées décrites ci\-dessous\ : +Supposons par exemple que le fichier des préférences contienne les trois entrées décrites ci\-dessous\ \&: .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 Package: * @@ -224,23 +229,26 @@ Pin\-Priority: 50 .fi .RE .PP -Alors\ : -.TP 3n -\(bu -La version la plus récente du paquet +Alors\ \&: +.sp +.RS 4 +\h'-04'\(bu\h'+03'La version la plus récente du paquet perl sera installé pour autant que son numéro de version commence par -5.8. Si l'\fIune\fR -des versions 5.8* existe et si la version installée est une version 5.9*, il y aura un retour en arrière. -.TP 3n -\(bu -Les versions des paquets (autres que -perl) disponibles dans le site local ont priorité sur les autres versions, même celles appartenant à la distribution par défaut. -.TP 3n -\(bu -La version d'un paquet dont l'origine n'est pas le site local mais un site internet listé dans +5\&.8\&. Si l\'\fIune\fR +des versions 5\&.8* existe et si la version installée est une version 5\&.9*, il y aura un retour en arrière\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Les versions des paquets (autres que +perl) disponibles dans le site local ont priorité sur les autres versions, même celles appartenant à la distribution par défaut\&. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'La version d\'un paquet dont l\'origine n\'est pas le site local mais un site internet listé dans \fBsources.list\fR(5)et qui appartient à une distribution -unstable, ne sera installée que si aucune version du paquet n'est déjà installée. +unstable, ne sera installée que si aucune version du paquet n\'est déjà installée\&. +.RE .sp .RE .SS "Détermination de la version des paquets et des propriétés des distributions" @@ -250,46 +258,46 @@ Chaque source list \fIPackages\fR et \fIRelease\fR -qui décrivent les paquets disponibles à cet endroit. +qui décrivent les paquets disponibles à cet endroit\&. .PP Le fichier \fIPackages\fR se trouve normalement dans le répertoire -\fI.../dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR, par exemple, -\fI.../dists/stable/main/binary\-i386/Packages\fR. Il consiste en entrées composées de lignes, une pour chaque paquet disponible dans le répertoire. Seules deux lignes des entrées sont pertinentes pour la détermination des priorités\ : +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR, par exemple, +\fI\&.\&.\&./dists/stable/main/binary\-i386/Packages\fR\&. Il consiste en entrées composées de lignes, une pour chaque paquet disponible dans le répertoire\&. Seules deux lignes des entrées sont pertinentes pour la détermination des priorités\ \&: .PP La ligne Package: -.RS 3n +.RS 4 donne le nom du paquet .RE .PP La ligne Version: -.RS 3n +.RS 4 donne le numéro de version du paquet .RE .PP Le fichier \fIRelease\fR se trouve normalement dans le répertoire -\fI.../dists/\fR\fI\fIdist\-name\fR\fR, par exemple, -\fI.../dists/stable/Release\fR, ou -\fI.../dists/woody/Release\fR. Il consiste en une seule entrée composée de plusieurs lignes qui s'applique à +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR, par exemple, +\fI\&.\&.\&./dists/stable/Release\fR, ou +\fI\&.\&.\&./dists/woody/Release\fR\&. Il consiste en une seule entrée composée de plusieurs lignes qui s\'applique à \fItous\fR -les paquets situés dans les répertoires sous le répertoire parent. Contrairement au fichier +les paquets situés dans les répertoires sous le répertoire parent\&. Contrairement au fichier \fIPackages\fR, presque toutes les lignes du fichier \fIRelease\fR -sont pertinentes pour déterminer les priorités\ : +sont pertinentes pour déterminer les priorités\ \&: .PP La ligne Archive: -.RS 3n -nomme l'archive à laquelle appartiennent tous les paquets situés dans les répertoires. Par exemple, la ligne +.RS 4 +nomme l\'archive à laquelle appartiennent tous les paquets situés dans les répertoires\&. Par exemple, la ligne Archive: stable indique que tous les paquets dans les répertoires situés sous le répertoire parent du fichier \fIRelease\fR -appartiennent à l'archive -stable. Indiquer cette valeur dans le fichier des préférences demanderait cette ligne\ : +appartiennent à l\'archive +stable\&. Indiquer cette valeur dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release a=stable .fi @@ -297,31 +305,31 @@ Pin: release a=stable .RE .PP La ligne Version: -.RS 3n -indique la version de la distribution. Par exemple, les paquets dans les répertoires peuvent appartenir à la distribution Debian GNU/Linux version 3.0. Il n'y a pas de numéro de version pour les distributions +.RS 4 +indique la version de la distribution\&. Par exemple, les paquets dans les répertoires peuvent appartenir à la distribution Debian GNU/Linux version 3\&.0\&. Il n\'y a pas de numéro de version pour les distributions testing et unstable -car elles n'ont pas encore été publiées. Indiquer cette valeur dans le fichier des préférences demanderait ces lignes\ : +car elles n\'ont pas encore été publiées\&. Indiquer cette valeur dans le fichier des préférences demanderait ces lignes\ \&: .sp -.RS 3n +.RS 4 .nf -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 +Pin: release v=3\&.0 +Pin: release a=stable, v=3\&.0 +Pin: release 3\&.0 .fi .RE .RE .PP La ligne Component: -.RS 3n +.RS 4 nomme un composant qui indique le type de licence associée aux paquets situés dans les répertoires sous le fichier -\fIRelease\fR. Par exemple, la ligne +\fIRelease\fR\&. Par exemple, la ligne Component: main indique que tous les exemplaires dans les répertoires appartiennent au composant -main, c'est\-à\-dire que leur licence est en accord avec les Directives Debian pour le logiciel libre. Indiquer ce composant dans le fichier des préférences demanderait cette ligne\ : +main, c\'est\-à\-dire que leur licence est en accord avec les Directives Debian pour le logiciel libre\&. Indiquer ce composant dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release c=main .fi @@ -329,12 +337,12 @@ Pin: release c=main .RE .PP La ligne Origin: -.RS 3n -nomme l'origine des paquets situés dans les répertoires sous le fichier -\fIRelease\fR. En général, c'est -Debian. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ : +.RS 4 +nomme l\'origine des paquets situés dans les répertoires sous le fichier +\fIRelease\fR\&. En général, c\'est +Debian\&. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release o=Debian .fi @@ -342,12 +350,12 @@ Pin: release o=Debian .RE .PP La ligne Label: -.RS 3n +.RS 4 indique un label pour les paquets qui se trouvent dans les répertoires sous le fichier -\fIRelease\fR. En général, c'est -Debian. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ : +\fIRelease\fR\&. En général, c\'est +Debian\&. Indiquer cette origine dans le fichier des préférences demanderait cette ligne\ \&: .sp -.RS 3n +.RS 4 .nf Pin: release l=Debian .fi @@ -364,37 +372,37 @@ r ou dans le fichier spécifié par la variable Dir::State::Lists dans le fichier -\fIapt.conf\fR. Par exemple, le fichier -\fIdebian.lcs.mit.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR +\fIapt\&.conf\fR\&. Par exemple, le fichier +\fIdebian\&.lcs\&.mit\&.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR contient le fichier \fIRelease\fR du site -debian.lcs.mit.edu, architecture +debian\&.lcs\&.mit\&.edu, architecture binary\-i386 et composant contrib de la distribution -unstable. +unstable\&. .SS "Lignes facultatives dans le fichier des préférences" .PP Toute entrée du fichier des préférences peut commencer par une ou plusieurs lignes contenant le mot -Explanation:. Cela permet des commentaires. +Explanation:\&. Cela permet des commentaires\&. .PP La ligne Pin\-Priority: -d'une entrée est facultative. Si elle n'existe pas, APT affecte une priorité inférieure de 1 à la valeur spécifiée sur une ligne commençant par -Pin\-Priority: release .... +d\'une entrée est facultative\&. Si elle n\'existe pas, APT affecte une priorité inférieure de 1 à la valeur spécifiée sur une ligne commençant par +Pin\-Priority: release \&.\&.\&.\&. .SH "EXEMPLES" -.SS "Comment suivre Stable\ ?" +.SS "Comment suivre Stable\ \&?" .PP Le fichier des préférences suivant affecte une priorité plus haute que la priorité par défaut (500) à tous les exemplaires appartenant à la distribution stable -et une priorité prohibitivement basse à tous les exemplaires appartenant à d'autres distributions -Debian. +et une priorité prohibitivement basse à tous les exemplaires appartenant à d\'autres distributions +Debian\&. .sp -.RS 3n +.RS 4 .nf -Explanation: Ne pas installer des exemplaires d'origine Debian +Explanation: Ne pas installer des exemplaires d\'origine Debian Explanation: sauf ceux de la distribution stable Package: * Pin: release a=stable @@ -405,41 +413,39 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP Avec le fichier des préférences ci\-dessus et un fichier \fBsources.list\fR(5)adéquat, les commandes suivantes utiliseront les versions les plus récentes de stable -pour faire la mise à niveau\ : +pour faire la mise à niveau\ \&: .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP La commande suivante utilisera la version la plus récente de la distribution testing -pour mettre à niveau le paquet spécifié\ ; cependant les mises à niveau ultérieures du paquet ne se feront pas à moins de relancer la commande. +pour mettre à niveau le paquet spécifié\ \&; cependant les mises à niveau ultérieures du paquet ne se feront pas à moins de relancer la commande\&. .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR/testing .fi .RE .sp -.SS "Comment suivre Testing ou Unstable\ ?" +.SS "Comment suivre Testing ou Unstable\ \&?" .PP Le fichier des préférences suivant affecte une priorité haute aux versions des paquets appartenant à la distribution testing, une priorité moindre aux versions appartenant à la distribution unstable -et une priorité prohibitivement basse aux versions appartenant à d'autres distributions -Debian. +et une priorité prohibitivement basse aux versions appartenant à d\'autres distributions +Debian\&. .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=testing @@ -454,33 +460,31 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP Avec un fichier \fBsources.list\fR(5)approprié et le fichier des préférences ci\-dessus, les commandes suivantes utiliseront les versions les plus récentes de testing -pour faire la mise à niveau\ : +pour faire la mise à niveau\ \&: .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP La commande suivante utilisera la version la plus récente de la distribution unstable -pour mettre à niveau le paquet spécifié\ ; Par la suite, +pour mettre à niveau le paquet spécifié\ \&; Par la suite, \fBapt\-get upgrade\fR mettra le paquet à jour avec la plus récente version dans testing si elle est plus récente que la version installée ou avec la plus récente version dans unstable -si elle est plus récente que la version installée. +si elle est plus récente que la version installée\&. .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpaquet\fR/unstable .fi @@ -489,28 +493,30 @@ apt\-get install \fIpaquet\fR/unstable .SH "SEE ALSO" .PP -\fBapt\-get\fR(8) -\fBapt\-cache\fR(8) +\fBapt-get\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) \fBsources.list\fR(5) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTEUR" .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/sources.list.5 b/doc/fr/sources.list.5 index a77df4b..374ca10 100644 --- a/doc/fr/sources.list.5 +++ b/doc/fr/sources.list.5 @@ -1,11 +1,11 @@ .\" Title: sources.list .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "SOURCES.LIST" "5" "29 February 2004" "Linux" "" +.TH "SOURCES\&.LIST" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,246 +14,248 @@ sources.list \- Liste des sources de paquets .SH "DESCRIPTION" .PP -La liste des sources de paquets indique où trouver les archives du système de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne documente que le système d'empaquetage utilisé par le système Debian GNU/Linux. Ce fichier de contrôle est -\fI/etc/apt/sources.list\fR. +La liste des sources de paquets indique où trouver les archives du système de distribution de paquets utilisé\&. Pour l\'instant, cette page de manuel ne documente que le système d\'empaquetage utilisé par le système Debian GNU/Linux\&. Ce fichier de contrôle est +\fI/etc/apt/sources\&.list\fR\&. .PP -La liste des sources est conçue pour prendre en compte un nombre quelconque de sources actives et différents média. Le fichier présente une source par ligne et la source préférée apparaît en premier. Le format de chaque ligne est\ : -type uri args. Le premier élément, +La liste des sources est conçue pour prendre en compte un nombre quelconque de sources actives et différents média\&. Le fichier présente une source par ligne et la source préférée apparaît en premier\&. Le format de chaque ligne est\ \&: +type uri args\&. Le premier élément, type, détermine le format des -args. +args\&. uri -est un identificateur universel de ressources (URI), qui est un sur\-ensemble du plus spécifique et bien connu repère universel de ressources, ou URL. La fin de la ligne peut être un commentaire commençant par un caractère #. +est un identificateur universel de ressources (URI), qui est un sur\-ensemble du plus spécifique et bien connu repère universel de ressources, ou URL\&. La fin de la ligne peut être un commentaire commençant par un caractère #\&. .SH "SOURCES.LIST.D" .PP Le répertoire -\fI/etc/apt/sources.list.d\fR +\fI/etc/apt/sources\&.list\&.d\fR permet de lister des sources de paquets dans des fichiers distincts qui se terminent par -.list. Leur format est le même que celui du fichier -\fIsources.list\fR. -.SH "LES TYPES DEB ET DEB\-SRC." +\&.list\&. Leur format est le même que celui du fichier +\fIsources\&.list\fR\&. +.SH "LES TYPES DEB ET DEB-SRC." .PP Le type deb décrit une archive Debian classique à deux niveaux, -\fIdistribution/composant\fR. +\fIdistribution/composant\fR\&. distribution -peut prendre l'une des valeurs suivantes\ : +peut prendre l\'une des valeurs suivantes\ \&: stable, unstable, ou -testing, et composant\ : +testing, et composant\ \&: main, contrib, non\-free, ou -non\-us. Le type +non\-us\&. Le type deb\-src décrit le code source pour une distribution Debian dans le même format que le type -deb. Une ligne +deb\&. Une ligne deb\-src -est nécessaire pour récupérer les index des sources. +est nécessaire pour récupérer les index des sources\&. .PP -Le format d'une entrée dans -\fIsources.list\fR +Le format d\'une entrée dans +\fIsources\&.list\fR utilisant les types deb et deb\-src -est de la forme\ : +est de la forme\ \&: .sp -.RS 3n +.RS 4 .nf -deb uri distribution [composant1] [composant2] [...] +deb uri distribution [composant1] [composant2] [\&.\&.\&.] .fi .RE .PP -L'URI de type +L\'URI de type deb -doit indiquer la base de la distribution Debian dans laquelle APT trouvera les informations dont il a besoin. +doit indiquer la base de la distribution Debian dans laquelle APT trouvera les informations dont il a besoin\&. distribution -peut spécifier le chemin exact\ : dans ce cas, on doit omettre les composants et +peut spécifier le chemin exact\ \&: dans ce cas, on doit omettre les composants et distribution -doit se terminer par une barre oblique (/). C'est utile quand seule une sous\-section particulière de l'archive décrite par cet URI est intéressante. Quand +doit se terminer par une barre oblique (/)\&. C\'est utile quand seule une sous\-section particulière de l\'archive décrite par cet URI est intéressante\&. Quand distribution -n'indique pas un chemin exact, un +n\'indique pas un chemin exact, un composant -au moins doit être présent. +au moins doit être présent\&. .PP distribution peut aussi contenir une variable -$(ARCH), qui sera remplacée par l'architecture Debian (i386, m68k, powerpc, ...) sur laquelle s'exécute le système. On peut ainsi utiliser un fichier -\fIsources.list\fR -qui ne dépend pas d'une architecture. En général, ce n'est intéressant que si l'on indique un chemin exact\ ; sinon +$(ARCH), qui sera remplacée par l\'architecture Debian (i386, m68k, powerpc, \&.\&.\&.) sur laquelle s\'exécute le système\&. On peut ainsi utiliser un fichier +\fIsources\&.list\fR +qui ne dépend pas d\'une architecture\&. En général, ce n\'est intéressant que si l\'on indique un chemin exact\ \&; sinon APT -crée automatiquement un URI en fonction de l'architecture effective. +crée automatiquement un URI en fonction de l\'architecture effective\&. .PP -Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être nécessaire de disposer le même URI sur plusieurs lignes quand on veut accéder à un sous\-ensemble des distributions ou composants disponibles à cette adresse. APT trie les URI après avoir crée pour lui\-même la liste complète\ ; il regroupe les références multiples au même hôte Internet en vue d'une connexion unique et il évite ainsi, par exemple, d'établir une connexion FTP, de la fermer, faire autre chose, puis d'établir encore cette connexion. Cette fonctionnalité permet l'accès à des sites FTP surchargés qui limitent le nombre de connexions simultanées pour les utilisateurs anonymes. APT parallélise aussi les connexions à différents hôtes pour tirer plus efficacement parti des sites à faible bande passante. +Puisqu\'on ne peut indiquer qu\'une seule distribution par ligne, il peut être nécessaire de disposer le même URI sur plusieurs lignes quand on veut accéder à un sous\-ensemble des distributions ou composants disponibles à cette adresse\&. APT trie les URI après avoir crée pour lui\-même la liste complète\ \&; il regroupe les références multiples au même hôte Internet en vue d\'une connexion unique et il évite ainsi, par exemple, d\'établir une connexion FTP, de la fermer, faire autre chose, puis d\'établir encore cette connexion\&. Cette fonctionnalité permet l\'accès à des sites FTP surchargés qui limitent le nombre de connexions simultanées pour les utilisateurs anonymes\&. APT parallélise aussi les connexions à différents hôtes pour tirer plus efficacement parti des sites à faible bande passante\&. .PP -Il est important d'indiquer les sources par ordre de préférence, la source principale apparaissant en premier. Un tri est fait, de la plus rapide à la plus lente\ ; par exemple, un cédérom suivi par les hôtes d'un réseau local, puis les hôtes distants. +Il est important d\'indiquer les sources par ordre de préférence, la source principale apparaissant en premier\&. Un tri est fait, de la plus rapide à la plus lente\ \&; par exemple, un cédérom suivi par les hôtes d\'un réseau local, puis les hôtes distants\&. .PP -Voici quelques exemples\ : +Voici quelques exemples\ \&: .sp -.RS 3n +.RS 4 .nf -deb http://http.us.debian.org/debian stable main contrib non\-free -deb http://http.us.debian.org/debian dists/stable\-updates/ +deb http://http\&.us\&.debian\&.org/debian stable main contrib non\-free +deb http://http\&.us\&.debian\&.org/debian dists/stable\-updates/ .fi .RE .SH "LA SPÉCIFICATION DES URI" .PP -Les URI actuellement reconnus sont\ : cdrom, file, http et ftp. +Les URI actuellement reconnus sont\ \&: cdrom, file, http et ftp\&. .PP file -.RS 3n +.RS 4 Le procédé file -permet qu'un répertoire arbitraire au sein du système de fichier soit considéré comme une archive. On s'en sert avec les montages NFS, les miroirs et les archives locaux. +permet qu\'un répertoire arbitraire au sein du système de fichier soit considéré comme une archive\&. On s\'en sert avec les montages NFS, les miroirs et les archives locaux\&. .RE .PP cdrom -.RS 3n +.RS 4 Le procédé cdrom -permet l'utilisation d'un lecteur de cédérom avec la possibilité de changer de media. Utilisez le programme -\fBapt\-cdrom\fR(8) -pour créer des entrées dans la liste des sources. +permet l\'utilisation d\'un lecteur de cédérom avec la possibilité de changer de media\&. Utilisez le programme +\fBapt-cdrom\fR(8) +pour créer des entrées dans la liste des sources\&. .RE .PP http -.RS 3n +.RS 4 Le procédé http -indique un serveur HTTP comme archive. Si une variable d'environnement +indique un serveur HTTP comme archive\&. Si une variable d\'environnement \fBhttp_proxy\fR (au format http://server:port/) existe, le serveur mandataire indiqué par \fBhttp_proxy\fR -est utilisé. Quand un serveur mandataire HTTP/1.1 demande une authentification, on peut utiliser la chaîne http://user:pass@server:port/. Notez qu'il s'agit d'une méthode d'authentification peu sûre. +est utilisé\&. Quand un serveur mandataire HTTP/1\&.1 demande une authentification, on peut utiliser la chaîne http://user:pass@server:port/\&. Notez qu\'il s\'agit d\'une méthode d\'authentification peu sûre\&. .RE .PP ftp -.RS 3n +.RS 4 Le procédé ftp -indique un serveur FTP comme archive. Le fonctionnement en mode ftp est largement configurable\ ; référez\-vous à la page de manuel de -\fBapt\-cdrom\fR(8) -pour d'autres informations. On remarquera qu'on peut indiquer un mandataire ftp avec la variable d'environnement -\fBftp_proxy\fR. On peut aussi spécifier un mandataire http (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant cette méthode et SEULEMENT cette méthode. Les mandataires ftp utilisant http et qui sont spécifiés dans le fichier de configuration seront ignorés. +indique un serveur FTP comme archive\&. Le fonctionnement en mode ftp est largement configurable\ \&; référez\-vous à la page de manuel de +\fBapt-cdrom\fR(8) +pour d\'autres informations\&. On remarquera qu\'on peut indiquer un mandataire ftp avec la variable d\'environnement +\fBftp_proxy\fR\&. On peut aussi spécifier un mandataire http (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant cette méthode et SEULEMENT cette méthode\&. Les mandataires ftp utilisant http et qui sont spécifiés dans le fichier de configuration seront ignorés\&. .RE .PP copy -.RS 3n +.RS 4 Le procédé copy est identique au procédé file -excepté que les paquets sont copiés dans le cache du répertoire au lieu d'être utilisés directement depuis leur emplacement. C'est utile aux gens qui utilisent un disque zip pour recopier des fichiers avec APT. +excepté que les paquets sont copiés dans le cache du répertoire au lieu d\'être utilisés directement depuis leur emplacement\&. C\'est utile aux gens qui utilisent un disque zip pour recopier des fichiers avec APT\&. .RE .PP rsh, ssh -.RS 3n -Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante en tant que tel utilisateur donné et pour accéder aux fichiers. Aucune authentification par mot de passe n'est possible\ : il faut au préalable régler ce problème avec des clés RSA ou bien rhosts. Pour l'accès aux fichiers de la machine distante et le transfert, on utilise les commandes standard +.RS 4 +Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante en tant que tel utilisateur donné et pour accéder aux fichiers\&. Aucune authentification par mot de passe n\'est possible\ \&: il faut au préalable régler ce problème avec des clés RSA ou bien rhosts\&. Pour l\'accès aux fichiers de la machine distante et le transfert, on utilise les commandes standard \fBfind\fR et -\fBdd\fR. +\fBdd\fR\&. .RE .SH "EXEMPLES" .PP -Utiliser l'archive stockée localement (ou montée via NFS) dans /home/jason/debian pour stable/main, stable/contrib et stable/non\-free. +Utiliser l\'archive stockée localement (ou montée via NFS) dans /home/jason/debian pour stable/main, stable/contrib et stable/non\-free\&. .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian stable main contrib non\-free .fi .RE .PP -Comme ci\-dessus, excepté que cette ligne utilise la distribution \(Fo\ unstable\ \(Fc (développement). +Comme ci\-dessus, excepté que cette ligne utilise la distribution \(Fo\ \&unstable\ \&\(Fc (développement)\&. .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian unstable main contrib non\-free .fi .RE .PP -La précédente ligne, mais pour les sources. +La précédente ligne, mais pour les sources\&. .sp -.RS 3n +.RS 4 .nf deb\-src file:/home/jason/debian unstable main contrib non\-free .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à archive.debian.org, et n'utiliser que la section hamm/main. +Utiliser HTTP pour accéder à l\'archive située à archive\&.debian\&.org, et n\'utiliser que la section hamm/main\&. .sp -.RS 3n +.RS 4 .nf -deb http://archive.debian.org/debian\-archive hamm main +deb http://archive\&.debian\&.org/debian\-archive hamm main .fi .RE .PP -Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le répertoire debian, et n'utiliser que la section stable/contrib. +Utiliser FTP pour accéder à l\'archive située à ftp\&.debian\&.org, dans le répertoire debian, et n\'utiliser que la section stable/contrib\&. .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian stable contrib +deb ftp://ftp\&.debian\&.org/debian stable contrib .fi .RE .PP -Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le répertoire debian, et n'utiliser que la section unstable/contrib. Si cette ligne et celle de l'exemple précédent dans -\fIsources.list\fR -apparaissent, une seule session FTP sera utilisée pour les deux lignes. +Utiliser FTP pour accéder à l\'archive située à ftp\&.debian\&.org, dans le répertoire debian, et n\'utiliser que la section unstable/contrib\&. Si cette ligne et celle de l\'exemple précédent dans +\fIsources\&.list\fR +apparaissent, une seule session FTP sera utilisée pour les deux lignes\&. .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian unstable contrib +deb ftp://ftp\&.debian\&.org/debian unstable contrib .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le répertoire debian\-non\-US. +Utiliser HTTP pour accéder à l\'archive située à nonus\&.debian\&.org, dans le répertoire debian\-non\-US\&. .sp -.RS 3n +.RS 4 .nf -deb http://nonus.debian.org/debian\-non\-US stable/non\-US main contrib non\-free +deb http://nonus\&.debian\&.org/debian\-non\-US stable/non\-US main contrib non\-free .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le répertoire debian\-non\-US, et n'utiliser que les fichiers trouvés dans +Utiliser HTTP pour accéder à l\'archive située à nonus\&.debian\&.org, dans le répertoire debian\-non\-US, et n\'utiliser que les fichiers trouvés dans \fIunstable/binary\-i386\fR pour les machines i386, dans \fIunstable/binary\-m68k\fR -pour les machines m68k et ainsi de suite pour les autres architectures reconnues. [Notez que cet exemple montre seulement la manière d'utiliser la variable à substituer, non\-us n'étant plus structuré de cette manière.] +pour les machines m68k et ainsi de suite pour les autres architectures reconnues\&. [Notez que cet exemple montre seulement la manière d\'utiliser la variable à substituer, non\-us n\'étant plus structuré de cette manière\&.] .sp -.RS 3n +.RS 4 .nf -deb http://ftp.de.debian.org/debian\-non\-US unstable/binary\-$(ARCH)/ +deb http://ftp\&.de\&.debian\&.org/debian\-non\-US unstable/binary\-$(ARCH)/ .fi .RE .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/fr/sources.list.fr.5 b/doc/fr/sources.list.fr.5 index a77df4b..374ca10 100644 --- a/doc/fr/sources.list.fr.5 +++ b/doc/fr/sources.list.fr.5 @@ -1,11 +1,11 @@ .\" Title: sources.list .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "SOURCES.LIST" "5" "29 February 2004" "Linux" "" +.TH "SOURCES\&.LIST" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,246 +14,248 @@ sources.list \- Liste des sources de paquets .SH "DESCRIPTION" .PP -La liste des sources de paquets indique où trouver les archives du système de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne documente que le système d'empaquetage utilisé par le système Debian GNU/Linux. Ce fichier de contrôle est -\fI/etc/apt/sources.list\fR. +La liste des sources de paquets indique où trouver les archives du système de distribution de paquets utilisé\&. Pour l\'instant, cette page de manuel ne documente que le système d\'empaquetage utilisé par le système Debian GNU/Linux\&. Ce fichier de contrôle est +\fI/etc/apt/sources\&.list\fR\&. .PP -La liste des sources est conçue pour prendre en compte un nombre quelconque de sources actives et différents média. Le fichier présente une source par ligne et la source préférée apparaît en premier. Le format de chaque ligne est\ : -type uri args. Le premier élément, +La liste des sources est conçue pour prendre en compte un nombre quelconque de sources actives et différents média\&. Le fichier présente une source par ligne et la source préférée apparaît en premier\&. Le format de chaque ligne est\ \&: +type uri args\&. Le premier élément, type, détermine le format des -args. +args\&. uri -est un identificateur universel de ressources (URI), qui est un sur\-ensemble du plus spécifique et bien connu repère universel de ressources, ou URL. La fin de la ligne peut être un commentaire commençant par un caractère #. +est un identificateur universel de ressources (URI), qui est un sur\-ensemble du plus spécifique et bien connu repère universel de ressources, ou URL\&. La fin de la ligne peut être un commentaire commençant par un caractère #\&. .SH "SOURCES.LIST.D" .PP Le répertoire -\fI/etc/apt/sources.list.d\fR +\fI/etc/apt/sources\&.list\&.d\fR permet de lister des sources de paquets dans des fichiers distincts qui se terminent par -.list. Leur format est le même que celui du fichier -\fIsources.list\fR. -.SH "LES TYPES DEB ET DEB\-SRC." +\&.list\&. Leur format est le même que celui du fichier +\fIsources\&.list\fR\&. +.SH "LES TYPES DEB ET DEB-SRC." .PP Le type deb décrit une archive Debian classique à deux niveaux, -\fIdistribution/composant\fR. +\fIdistribution/composant\fR\&. distribution -peut prendre l'une des valeurs suivantes\ : +peut prendre l\'une des valeurs suivantes\ \&: stable, unstable, ou -testing, et composant\ : +testing, et composant\ \&: main, contrib, non\-free, ou -non\-us. Le type +non\-us\&. Le type deb\-src décrit le code source pour une distribution Debian dans le même format que le type -deb. Une ligne +deb\&. Une ligne deb\-src -est nécessaire pour récupérer les index des sources. +est nécessaire pour récupérer les index des sources\&. .PP -Le format d'une entrée dans -\fIsources.list\fR +Le format d\'une entrée dans +\fIsources\&.list\fR utilisant les types deb et deb\-src -est de la forme\ : +est de la forme\ \&: .sp -.RS 3n +.RS 4 .nf -deb uri distribution [composant1] [composant2] [...] +deb uri distribution [composant1] [composant2] [\&.\&.\&.] .fi .RE .PP -L'URI de type +L\'URI de type deb -doit indiquer la base de la distribution Debian dans laquelle APT trouvera les informations dont il a besoin. +doit indiquer la base de la distribution Debian dans laquelle APT trouvera les informations dont il a besoin\&. distribution -peut spécifier le chemin exact\ : dans ce cas, on doit omettre les composants et +peut spécifier le chemin exact\ \&: dans ce cas, on doit omettre les composants et distribution -doit se terminer par une barre oblique (/). C'est utile quand seule une sous\-section particulière de l'archive décrite par cet URI est intéressante. Quand +doit se terminer par une barre oblique (/)\&. C\'est utile quand seule une sous\-section particulière de l\'archive décrite par cet URI est intéressante\&. Quand distribution -n'indique pas un chemin exact, un +n\'indique pas un chemin exact, un composant -au moins doit être présent. +au moins doit être présent\&. .PP distribution peut aussi contenir une variable -$(ARCH), qui sera remplacée par l'architecture Debian (i386, m68k, powerpc, ...) sur laquelle s'exécute le système. On peut ainsi utiliser un fichier -\fIsources.list\fR -qui ne dépend pas d'une architecture. En général, ce n'est intéressant que si l'on indique un chemin exact\ ; sinon +$(ARCH), qui sera remplacée par l\'architecture Debian (i386, m68k, powerpc, \&.\&.\&.) sur laquelle s\'exécute le système\&. On peut ainsi utiliser un fichier +\fIsources\&.list\fR +qui ne dépend pas d\'une architecture\&. En général, ce n\'est intéressant que si l\'on indique un chemin exact\ \&; sinon APT -crée automatiquement un URI en fonction de l'architecture effective. +crée automatiquement un URI en fonction de l\'architecture effective\&. .PP -Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être nécessaire de disposer le même URI sur plusieurs lignes quand on veut accéder à un sous\-ensemble des distributions ou composants disponibles à cette adresse. APT trie les URI après avoir crée pour lui\-même la liste complète\ ; il regroupe les références multiples au même hôte Internet en vue d'une connexion unique et il évite ainsi, par exemple, d'établir une connexion FTP, de la fermer, faire autre chose, puis d'établir encore cette connexion. Cette fonctionnalité permet l'accès à des sites FTP surchargés qui limitent le nombre de connexions simultanées pour les utilisateurs anonymes. APT parallélise aussi les connexions à différents hôtes pour tirer plus efficacement parti des sites à faible bande passante. +Puisqu\'on ne peut indiquer qu\'une seule distribution par ligne, il peut être nécessaire de disposer le même URI sur plusieurs lignes quand on veut accéder à un sous\-ensemble des distributions ou composants disponibles à cette adresse\&. APT trie les URI après avoir crée pour lui\-même la liste complète\ \&; il regroupe les références multiples au même hôte Internet en vue d\'une connexion unique et il évite ainsi, par exemple, d\'établir une connexion FTP, de la fermer, faire autre chose, puis d\'établir encore cette connexion\&. Cette fonctionnalité permet l\'accès à des sites FTP surchargés qui limitent le nombre de connexions simultanées pour les utilisateurs anonymes\&. APT parallélise aussi les connexions à différents hôtes pour tirer plus efficacement parti des sites à faible bande passante\&. .PP -Il est important d'indiquer les sources par ordre de préférence, la source principale apparaissant en premier. Un tri est fait, de la plus rapide à la plus lente\ ; par exemple, un cédérom suivi par les hôtes d'un réseau local, puis les hôtes distants. +Il est important d\'indiquer les sources par ordre de préférence, la source principale apparaissant en premier\&. Un tri est fait, de la plus rapide à la plus lente\ \&; par exemple, un cédérom suivi par les hôtes d\'un réseau local, puis les hôtes distants\&. .PP -Voici quelques exemples\ : +Voici quelques exemples\ \&: .sp -.RS 3n +.RS 4 .nf -deb http://http.us.debian.org/debian stable main contrib non\-free -deb http://http.us.debian.org/debian dists/stable\-updates/ +deb http://http\&.us\&.debian\&.org/debian stable main contrib non\-free +deb http://http\&.us\&.debian\&.org/debian dists/stable\-updates/ .fi .RE .SH "LA SPÉCIFICATION DES URI" .PP -Les URI actuellement reconnus sont\ : cdrom, file, http et ftp. +Les URI actuellement reconnus sont\ \&: cdrom, file, http et ftp\&. .PP file -.RS 3n +.RS 4 Le procédé file -permet qu'un répertoire arbitraire au sein du système de fichier soit considéré comme une archive. On s'en sert avec les montages NFS, les miroirs et les archives locaux. +permet qu\'un répertoire arbitraire au sein du système de fichier soit considéré comme une archive\&. On s\'en sert avec les montages NFS, les miroirs et les archives locaux\&. .RE .PP cdrom -.RS 3n +.RS 4 Le procédé cdrom -permet l'utilisation d'un lecteur de cédérom avec la possibilité de changer de media. Utilisez le programme -\fBapt\-cdrom\fR(8) -pour créer des entrées dans la liste des sources. +permet l\'utilisation d\'un lecteur de cédérom avec la possibilité de changer de media\&. Utilisez le programme +\fBapt-cdrom\fR(8) +pour créer des entrées dans la liste des sources\&. .RE .PP http -.RS 3n +.RS 4 Le procédé http -indique un serveur HTTP comme archive. Si une variable d'environnement +indique un serveur HTTP comme archive\&. Si une variable d\'environnement \fBhttp_proxy\fR (au format http://server:port/) existe, le serveur mandataire indiqué par \fBhttp_proxy\fR -est utilisé. Quand un serveur mandataire HTTP/1.1 demande une authentification, on peut utiliser la chaîne http://user:pass@server:port/. Notez qu'il s'agit d'une méthode d'authentification peu sûre. +est utilisé\&. Quand un serveur mandataire HTTP/1\&.1 demande une authentification, on peut utiliser la chaîne http://user:pass@server:port/\&. Notez qu\'il s\'agit d\'une méthode d\'authentification peu sûre\&. .RE .PP ftp -.RS 3n +.RS 4 Le procédé ftp -indique un serveur FTP comme archive. Le fonctionnement en mode ftp est largement configurable\ ; référez\-vous à la page de manuel de -\fBapt\-cdrom\fR(8) -pour d'autres informations. On remarquera qu'on peut indiquer un mandataire ftp avec la variable d'environnement -\fBftp_proxy\fR. On peut aussi spécifier un mandataire http (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant cette méthode et SEULEMENT cette méthode. Les mandataires ftp utilisant http et qui sont spécifiés dans le fichier de configuration seront ignorés. +indique un serveur FTP comme archive\&. Le fonctionnement en mode ftp est largement configurable\ \&; référez\-vous à la page de manuel de +\fBapt-cdrom\fR(8) +pour d\'autres informations\&. On remarquera qu\'on peut indiquer un mandataire ftp avec la variable d\'environnement +\fBftp_proxy\fR\&. On peut aussi spécifier un mandataire http (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant cette méthode et SEULEMENT cette méthode\&. Les mandataires ftp utilisant http et qui sont spécifiés dans le fichier de configuration seront ignorés\&. .RE .PP copy -.RS 3n +.RS 4 Le procédé copy est identique au procédé file -excepté que les paquets sont copiés dans le cache du répertoire au lieu d'être utilisés directement depuis leur emplacement. C'est utile aux gens qui utilisent un disque zip pour recopier des fichiers avec APT. +excepté que les paquets sont copiés dans le cache du répertoire au lieu d\'être utilisés directement depuis leur emplacement\&. C\'est utile aux gens qui utilisent un disque zip pour recopier des fichiers avec APT\&. .RE .PP rsh, ssh -.RS 3n -Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante en tant que tel utilisateur donné et pour accéder aux fichiers. Aucune authentification par mot de passe n'est possible\ : il faut au préalable régler ce problème avec des clés RSA ou bien rhosts. Pour l'accès aux fichiers de la machine distante et le transfert, on utilise les commandes standard +.RS 4 +Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante en tant que tel utilisateur donné et pour accéder aux fichiers\&. Aucune authentification par mot de passe n\'est possible\ \&: il faut au préalable régler ce problème avec des clés RSA ou bien rhosts\&. Pour l\'accès aux fichiers de la machine distante et le transfert, on utilise les commandes standard \fBfind\fR et -\fBdd\fR. +\fBdd\fR\&. .RE .SH "EXEMPLES" .PP -Utiliser l'archive stockée localement (ou montée via NFS) dans /home/jason/debian pour stable/main, stable/contrib et stable/non\-free. +Utiliser l\'archive stockée localement (ou montée via NFS) dans /home/jason/debian pour stable/main, stable/contrib et stable/non\-free\&. .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian stable main contrib non\-free .fi .RE .PP -Comme ci\-dessus, excepté que cette ligne utilise la distribution \(Fo\ unstable\ \(Fc (développement). +Comme ci\-dessus, excepté que cette ligne utilise la distribution \(Fo\ \&unstable\ \&\(Fc (développement)\&. .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian unstable main contrib non\-free .fi .RE .PP -La précédente ligne, mais pour les sources. +La précédente ligne, mais pour les sources\&. .sp -.RS 3n +.RS 4 .nf deb\-src file:/home/jason/debian unstable main contrib non\-free .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à archive.debian.org, et n'utiliser que la section hamm/main. +Utiliser HTTP pour accéder à l\'archive située à archive\&.debian\&.org, et n\'utiliser que la section hamm/main\&. .sp -.RS 3n +.RS 4 .nf -deb http://archive.debian.org/debian\-archive hamm main +deb http://archive\&.debian\&.org/debian\-archive hamm main .fi .RE .PP -Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le répertoire debian, et n'utiliser que la section stable/contrib. +Utiliser FTP pour accéder à l\'archive située à ftp\&.debian\&.org, dans le répertoire debian, et n\'utiliser que la section stable/contrib\&. .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian stable contrib +deb ftp://ftp\&.debian\&.org/debian stable contrib .fi .RE .PP -Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le répertoire debian, et n'utiliser que la section unstable/contrib. Si cette ligne et celle de l'exemple précédent dans -\fIsources.list\fR -apparaissent, une seule session FTP sera utilisée pour les deux lignes. +Utiliser FTP pour accéder à l\'archive située à ftp\&.debian\&.org, dans le répertoire debian, et n\'utiliser que la section unstable/contrib\&. Si cette ligne et celle de l\'exemple précédent dans +\fIsources\&.list\fR +apparaissent, une seule session FTP sera utilisée pour les deux lignes\&. .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian unstable contrib +deb ftp://ftp\&.debian\&.org/debian unstable contrib .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le répertoire debian\-non\-US. +Utiliser HTTP pour accéder à l\'archive située à nonus\&.debian\&.org, dans le répertoire debian\-non\-US\&. .sp -.RS 3n +.RS 4 .nf -deb http://nonus.debian.org/debian\-non\-US stable/non\-US main contrib non\-free +deb http://nonus\&.debian\&.org/debian\-non\-US stable/non\-US main contrib non\-free .fi .RE .PP -Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le répertoire debian\-non\-US, et n'utiliser que les fichiers trouvés dans +Utiliser HTTP pour accéder à l\'archive située à nonus\&.debian\&.org, dans le répertoire debian\-non\-US, et n\'utiliser que les fichiers trouvés dans \fIunstable/binary\-i386\fR pour les machines i386, dans \fIunstable/binary\-m68k\fR -pour les machines m68k et ainsi de suite pour les autres architectures reconnues. [Notez que cet exemple montre seulement la manière d'utiliser la variable à substituer, non\-us n'étant plus structuré de cette manière.] +pour les machines m68k et ainsi de suite pour les autres architectures reconnues\&. [Notez que cet exemple montre seulement la manière d\'utiliser la variable à substituer, non\-us n\'étant plus structuré de cette manière\&.] .sp -.RS 3n +.RS 4 .nf -deb http://ftp.de.debian.org/debian\-non\-US unstable/binary\-$(ARCH)/ +deb http://ftp\&.de\&.debian\&.org/debian\-non\-US unstable/binary\-$(ARCH)/ .fi .RE .SH "VOIR AUSSI" .PP -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) .SH "BOGUES" .PP Voyez la -[1]\&\fI page concernant les bogues d'APT\fR. Si vous voulez signaler un bogue, consultez le texte -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fI page concernant les bogues d\'APT\fR\&[1]\&. Si vous voulez signaler un bogue, consultez le texte +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ou utilisez la commande -\fBreportbug\fR(1). +\fBreportbug\fR(1)\&. .SH "TRADUCTION" .PP -Philippe Batailler. -. 2005. +Philippe Batailler\&. +\&. 2005\&. .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Auteur. -.SH "REFERENCES" -.TP 3 -1.\ page concernant les bogues d'APT +.SH "NOTES" +.IP " 1." 4 +page concernant les bogues d'APT +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-cache.8 b/doc/ja/apt-cache.8 index ae3fa9e..24d9354 100644 --- a/doc/ja/apt-cache.8 +++ b/doc/ja/apt-cache.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cache +.\" Title: apt-cache .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-cache \- APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ \-\- ¥­¥ã¥Ã¥·¥åÁàºî +apt-cache \- APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ -- ¥­¥ã¥Ã¥·¥åÁàºî .SH "SYNOPSIS" .HP 10 \fBapt\-cache\fR [\fB\-hvsn\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[add\ \fIfile\fR...] | [gencaches] | [showpkg\ \fIpkg\fR...] | [showsrc\ \fIpkg\fR...] | [stats] | [dump] | [dumpavail] | [unmet] | [search\ \fIregex\fR] | [show\ \fIpkg\fR...] | [depends\ \fIpkg\fR...] | [rdepends\ \fIpkg\fR...] | [pkgnames\ \fIprefix\fR] | [dotty\ \fIpkg\fR...] | [policy\ \fIpkgs\fR...] | [madison\ \fIpkgs\fR...]} @@ -28,13 +28,13 @@ apt\-cache \- APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP add \fIfile(s)\fR -.RS 3n +.RS 4 add ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ë»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÄɲä·¤Þ¤¹¡£ ¥Ç¥Ð¥Ã¥°ÀìÍѤǤ¹¡£ .RE .PP gencaches -.RS 3n +.RS 4 gencaches ¤Ï¡¢ \fBapt\-get check\fR @@ -45,76 +45,82 @@ gencaches .RE .PP showpkg \fIpkg(s)\fR -.RS 3n +.RS 4 showpkg ¤Ï¡¢ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤ËÎóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ ¸å¤Ë³¤¯°ú¿ô¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¤Ê¤ê¤Þ¤¹¡£ ³Æ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÈÈï°Í¸´Ø·¸¤òÎóµó¤·¡¢ ¤µ¤é¤Ë¤½¤Î³Æ¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ°Í¸´Ø·¸¤òɽ¼¨¤·¤Þ¤¹¡£ (Ä̾ï¤Î) °Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤¬°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò»Ø¤·¤Þ¤¹¡£ ¤Þ¤¿¡¢Èï°Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤Ë°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò»Ø¤·¤Þ¤¹¡£ ½¾¤Ã¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤ÏËþ¤¿¤µ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ Èï°Í¸´Ø·¸¤ÏËþ¤¿¤¹É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£ ¼ÂÎã¤È¤·¤Æ¡¢°Ê²¼¤Ë \fBapt\-cache showpkg libreadline2\fR ¤Î ½ÐÎϤò·Ç¤²¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: libreadline2 -Versions: 2.1\-12(/var/state/apt/lists/foo_Packages), +Versions: 2\&.1\-12(/var/state/apt/lists/foo_Packages), Reverse Depends: libreadlineg2,libreadline2 libreadline2\-altdev,libreadline2 Dependencies: -2.1\-12 \- libc5 (2 5.4.0\-0) ncurses3.0 (0 (null)) +2\&.1\-12 \- libc5 (2 5\&.4\&.0\-0) ncurses3\&.0 (0 (null)) Provides: -2.1\-12 \- +2\&.1\-12 \- Reverse Provides: .fi .RE -¤Ä¤Þ¤ê¡¢libreadline2 ¤Î version 2.1\-12 ¤Ï¡¢ libc5 ¤È ncurses3.0 ¤Ë°Í¸¤·¤Æ¤¤¤Æ¡¢libreadline2 ¤¬Æ°ºî¤¹¤ë¤Ë¤Ï¡¢ ¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤¬È½¤ê¤Þ¤¹¡£ °ìÊý¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï libreadline2 ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£ libreadline2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢libc5, ncurses3.0, ldso ¤ò ¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ ½ÐÎϤλĤê¤ÎÉôʬ¤Î°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Ï¡¢ apt ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÄ´¤Ù¤ë¤Î¤¬ºÇÎɤǤ·¤ç¤¦¡£ +¤Ä¤Þ¤ê¡¢libreadline2 ¤Î version 2\&.1\-12 ¤Ï¡¢ libc5 ¤È ncurses3\&.0 ¤Ë°Í¸¤·¤Æ¤¤¤Æ¡¢libreadline2 ¤¬Æ°ºî¤¹¤ë¤Ë¤Ï¡¢ ¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤¬È½¤ê¤Þ¤¹¡£ °ìÊý¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï libreadline2 ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£ libreadline2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢libc5, ncurses3\&.0, ldso ¤ò ¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ ½ÐÎϤλĤê¤ÎÉôʬ¤Î°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Ï¡¢ apt ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÄ´¤Ù¤ë¤Î¤¬ºÇÎɤǤ·¤ç¤¦¡£ .RE .PP stats -.RS 3n +.RS 4 stats ¤Ï¥­¥ã¥Ã¥·¥å¤Ë¤Ä¤¤¤Æ¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ ¤½¤ì°Ê¾å¡¢°ú¿ô¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£°Ê²¼¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ -.RS 3n -.TP 3n -\(bu -¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¸ø¼°¤ÎÉáÄ̤Υѥ屡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Ç»ÈÍѤµ¤ì¤¿Ì¾¾Î¤Ç¡¢¤½¤ì¤¬°ìÂаì¤ËÂбþ ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ Âç¿¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤³¤Î¥«¥Æ¥´¥ê¤ËÆþ¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -½ã¿è²¾Áۥѥ屡¼¥¸¤Ï¡¢ ²¾Áۥѥ屡¼¥¸Ì¾¤È¤·¤Æ¤Î¤ß¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸ (²¾Áۥѥ屡¼¥¸Ì¾¤Î¤ß¤ò¡ÖÄ󶡡פ·¡¢ ¼ÂºÝ¤Ë¤Ï¤¤¤«¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤â¤½¤Î̾¾Î¤ò»ý¤¿¤Ê¤¤) ¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï "mail\-transport\-agent" ¤Ï½ã¿è²¾Áۥѥ屡¼¥¸¤Ç¤¹¡£ "mail\-transport\-agent" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¤¬¡¢ "mail\-transport\-agent" ¤È¤¤¤¦Ì¾¾Î¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£ -.TP 3n -\(bu -ñ°ì²¾Áۥѥ屡¼¥¸¤Ï¡¢ ÆÃÄê¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ ¤¿¤À°ì¤Ä¤Î¾ì¹ç¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢"X11\-text\-viewer" ¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹¤¬¡¢"X11\-text\-viewer" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ xless ¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ -.TP 3n -\(bu -Ê£¹ç²¾Áۥѥ屡¼¥¸¤Ï¡¢ ¤½¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤¢¤ë¤«¡¢ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈƱ¤¸²¾Áۥѥ屡¼¥¸Ì¾¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ debconf ¤Ï¼ÂºÝ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤â¤¢¤ê¤Þ¤¹¤¬¡¢ debconf\-tiny ¤Ë¤è¤Ã¤ÆÄ󶡤⤵¤ì¤Æ¤¤¤Þ¤¹¡£ -.TP 3n -\(bu -·çÍî¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢ (¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡£ Ä̾ï¤Ç¤Ï¡¢¹½Ê¸¤¬Ì·½â¤¹¤ë¤È¤³¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤½¤Î¤¿¤á¡¢¤³¤ÎÃͤϺǾ®¤Ç¤â¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤È°ìÃפ·¤Þ¤¹¡£ ¤â¤·Ê£¿ô¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó (Îã "stable" ¤È "unstable" ¤ÎξÊý) ¤òÍøÍѤ·¤¿¾ì¹ç¡¢ ¤³¤ÎÃͤϥѥ屡¼¥¸Ì¾Áí¿ô¤è¤ê¤â¤«¤Ê¤êÂ礭¤¤¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -°Í¸´Ø·¸Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÍ׵ᤵ¤ì¤¿°Í¸´Ø·¸¤Î¿ô¤Ç¤¹¡£ -.RE -.IP "" 3n +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¸ø¼°¤ÎÉáÄ̤Υѥ屡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Ç»ÈÍѤµ¤ì¤¿Ì¾¾Î¤Ç¡¢¤½¤ì¤¬°ìÂаì¤ËÂбþ ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ Âç¿¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤³¤Î¥«¥Æ¥´¥ê¤ËÆþ¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'½ã¿è²¾Áۥѥ屡¼¥¸¤Ï¡¢ ²¾Áۥѥ屡¼¥¸Ì¾¤È¤·¤Æ¤Î¤ß¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸ (²¾Áۥѥ屡¼¥¸Ì¾¤Î¤ß¤ò¡ÖÄ󶡡פ·¡¢ ¼ÂºÝ¤Ë¤Ï¤¤¤«¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤â¤½¤Î̾¾Î¤ò»ý¤¿¤Ê¤¤) ¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï "mail\-transport\-agent" ¤Ï½ã¿è²¾Áۥѥ屡¼¥¸¤Ç¤¹¡£ "mail\-transport\-agent" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¤¬¡¢ "mail\-transport\-agent" ¤È¤¤¤¦Ì¾¾Î¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ñ°ì²¾Áۥѥ屡¼¥¸¤Ï¡¢ ÆÃÄê¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ ¤¿¤À°ì¤Ä¤Î¾ì¹ç¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢"X11\-text\-viewer" ¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹¤¬¡¢"X11\-text\-viewer" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ xless ¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ê£¹ç²¾Áۥѥ屡¼¥¸¤Ï¡¢ ¤½¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤¢¤ë¤«¡¢ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈƱ¤¸²¾Áۥѥ屡¼¥¸Ì¾¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ debconf ¤Ï¼ÂºÝ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤â¤¢¤ê¤Þ¤¹¤¬¡¢ debconf\-tiny ¤Ë¤è¤Ã¤ÆÄ󶡤⤵¤ì¤Æ¤¤¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'·çÍî¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢ (¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡£ Ä̾ï¤Ç¤Ï¡¢¹½Ê¸¤¬Ì·½â¤¹¤ë¤È¤³¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤½¤Î¤¿¤á¡¢¤³¤ÎÃͤϺǾ®¤Ç¤â¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤È°ìÃפ·¤Þ¤¹¡£ ¤â¤·Ê£¿ô¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó (Îã "stable" ¤È "unstable" ¤ÎξÊý) ¤òÍøÍѤ·¤¿¾ì¹ç¡¢ ¤³¤ÎÃͤϥѥ屡¼¥¸Ì¾Áí¿ô¤è¤ê¤â¤«¤Ê¤êÂ礭¤¤¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'°Í¸´Ø·¸Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÍ׵ᤵ¤ì¤¿°Í¸´Ø·¸¤Î¿ô¤Ç¤¹¡£ +.RE +.IP "" 4 .RE .PP showsrc \fIpkg(s)\fR -.RS 3n +.RS 4 showsrc ¤Ï¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë°ìÃפ¹¤ë¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£ ¥Ð¥¤¥Ê¥ê¤Ë¤Ê¤ë¤È¤­¤Î̾¾Î¤òÀë¸À¤·¤¿¥ì¥³¡¼¥É¤ÈƱÍͤˡ¢ ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æɽ¼¨¤·¤Þ¤¹¡£ .RE .PP dump -.RS 3n +.RS 4 dump ¤Ï¡¢ ¥­¥ã¥Ã¥·¥åÆâ¤Î¥Ñ¥Ã¥±¡¼¥¸¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ¡¢Ã»¤¤°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ ¼ç¤Ë¥Ç¥Ð¥Ã¥°ÍѤǤ¹¡£ .RE .PP dumpavail -.RS 3n +.RS 4 dumpavail ¤Ï¡¢ ɸ½à½ÐÎϤËÍøÍѲÄǽ¤Ê¤â¤Î¤Î°ìÍ÷¤ò½ÐÎϤ·¤Þ¤¹¡£ \fBdpkg\fR(8) @@ -124,21 +130,21 @@ dumpavail .RE .PP unmet -.RS 3n +.RS 4 unmet ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥åÆâ¤Ë¤¢¤ë¡¢ ÉÔŬÅö¤Ê°Í¸´Ø·¸¤Î³µÍפòɽ¼¨¤·¤Þ¤¹¡£ .RE .PP show \fIpkg(s)\fR -.RS 3n +.RS 4 show ¤Ï¡¢ \fBdpkg \-\-print\-avail\fR ¤ÈƱÍͤε¡Ç½¤ò¼Â¹Ô¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤Îɽ¼¨¤Ç¤¹¡£ .RE .PP -search \fIregex [ regex ... ]\fR -.RS 3n +search \fIregex [ regex \&.\&.\&. ]\fR +.RS 4 search ¤Ï¡¢Í¿¤¨¤é¤ì¤¿Àµµ¬É½¸½¤Ë¤è¤Ã¤Æ¡¢ ¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤ÆÁ´Ê¸¸¡º÷¤ò¹Ô¤¤¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈÀâÌÀ¤ËÂФ·¤Æ¸¡º÷¤ò¹Ô¤¤¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Èû¤¤ÀâÌÀʸ¤òɽ¼¨¤·¤Þ¤¹¡£ \fB\-\-full\fR @@ -153,29 +159,29 @@ show .RE .PP depends \fIpkg(s)\fR -.RS 3n +.RS 4 depends ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬»ý¤Ã¤Æ¤¤¤ë°Í¸´Ø·¸¤È¡¢ ¤½¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP rdepends \fIpkg(s)\fR -.RS 3n +.RS 4 rdepends ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬»ý¤ÄÈï°Í¸´Ø·¸¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ .RE .PP pkgnames \fI[ prefix ]\fR -.RS 3n +.RS 4 ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç¤Î³Æ¥Ñ¥Ã¥±¡¼¥¸¤Î̾¾Î¤òɽ¼¨¤·¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ë¤è¤ê¡¢¼èÆÀ¤¹¤ë°ìÍ÷¤è¤êÀèƬ°ìÃפÇÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤³¤Î½ÐÎϤϥ·¥§¥ë¤Î¥¿¥Ö¤Ë¤è¤ëÊä´°µ¡Ç½¤Ë»È¤¤¤ä¤¹¤¯¡¢ ¤Þ¤¿Èó¾ï¤Ë®¤¯À¸À®¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï \fB\-\-generate\fR ¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍѤ¹¤ë¤È¡¢ Èó¾ï¤ËÊØÍø¤Ç¤¹¡£ .RE .PP dotty \fIpkg(s)\fR -.RS 3n +.RS 4 dotty ¤Ï¡¢ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¡¢ -[1]\&\fIGraphViz\fR +\fIGraphViz\fR\&[1] ¥Ñ¥Ã¥±¡¼¥¸¤Î dotty ¥³¥Þ¥ó¥É¤ÇÍøÍѤ¹¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£ ·ë²Ì¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î´Ø·¸¤òɽ¤ï¤¹¡¢¥Î¡¼¥É¡¦¥¨¥Ã¥¸¤Î¥»¥Ã¥È¤Çɽ¸½¤µ¤ì¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î°Í¸¥Ñ¥Ã¥±¡¼¥¸¤ò¥È¥ì¡¼¥¹¤¹¤ë¤Î¤Ç¡¢ Èó¾ï¤ËÂ礭¤¤¿Þ¤¬ÆÀ¤é¤ì¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢APT::Cache::GivenOnly ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Æ²ò½ü¤Ç¤­¤Þ¤¹¡£ .sp @@ -185,13 +191,13 @@ dotty .RE .PP policy \fI[ pkg(s) ]\fR -.RS 3n +.RS 4 policy ¤Ï¡¢ ÀßÄê¥Õ¥¡¥¤¥ë´Ø·¸¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¡¢¥Ç¥Ð¥Ã¥°¤ò»Ù±ç¤·¤Þ¤¹¡£ °ú¿ô¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¼èÆÀ¸µ¤´¤È¤ÎÍ¥Àè½ç°Ì¤òɽ¼¨¤·¤Þ¤¹¡£ °ìÊý¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤¿¾ì¹ç¡¢ Í¥Àè½ç¤Î¾ÜºÙ¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP madison \fI/[ pkg(s) ]\fR -.RS 3n +.RS 4 apt\-cache ¤Î madison @@ -209,13 +215,13 @@ madison ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-p\fR, \fB\-\-pkg\-cache\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ï¡¢¤¹¤Ù¤Æ¤ÎÁàºî¤Ç»ÈÍѤµ¤ì¤ë°ì¼¡¥­¥ã¥Ã¥·¥å¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- Dir::Cache::pkgcache .RE .PP \fB\-s\fR, \fB\-\-src\-cache\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£ ¤³¤Î¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï gencaches ¤Ç¤Î¤ß»ÈÍѤµ¤ì¡¢ ¤³¤³¤Ë²òÀϤµ¤ì¤¿¼èÆÀ¸µ¤Î¥Ñ¥Ã¥±¡¼¥¸¾ðÊ󤬳ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë¡¢¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òºÆ²òÀϤòÈò¤±¤ë¾å¤ÇÊØÍø¤Ç¤¹¡£ @@ -224,26 +230,26 @@ Dir::Cache::srcpkgcache .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢ ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤µ¤é¤ËÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- quiet .RE .PP \fB\-i\fR, \fB\-\-important\fR -.RS 3n +.RS 4 ¡Ö½ÅÍסװ͸´Ø·¸¤Î¤ßɽ¼¨ \- unmet ¤È¶¦¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡Ö°Í¸¡×´Ø·¸¤È¡ÖÀè¹Ô°Í¸¡×´Ø·¸¤Î¤ß¤òɽ¼¨¤¹¤ë¤¿¤á¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::Important .RE .PP \fB\-f\fR, \fB\-\-full\fR -.RS 3n +.RS 4 search »þ¤ËÁ´¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::ShowFull .RE .PP \fB\-a\fR, \fB\-\-all\-versions\fR -.RS 3n +.RS 4 Á´ÍøÍѲÄǽ¥Ð¡¼¥¸¥ç¥ó¤Î¥ì¥³¡¼¥ÉÁ´ÂΤòɽ¼¨¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¡¢ ̵¸ú¤Ë¤¹¤ë¤Ë¤Ï \fB\-\-no\-all\-versions\fR ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ @@ -253,7 +259,7 @@ APT::Cache::AllVersions .RE .PP \fB\-g\fR, \fB\-\-generate\fR -.RS 3n +.RS 4 ¤½¤Î¤Þ¤Þ¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢ ¼«Æ°Åª¤Ë¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤òºÆÀ¸À®¤·¤Þ¤¹¡£¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¡¢ ̵¸ú¤Ë¤¹¤ë¤Ë¤Ï \fB\-\-no\-generate\fR ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ ÀßÄê¹àÌÜ \- @@ -261,20 +267,20 @@ APT::Cache::Generate .RE .PP \fB\-\-names\-only\fR, \fB\-n\fR -.RS 3n +.RS 4 ÀâÌÀʸ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¤Î¤ß¸¡º÷¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::NamesOnly .RE .PP \fB\-\-all\-names\fR -.RS 3n +.RS 4 pkgnames ¤Ç¡¢ ²¾Áۥѥ屡¼¥¸¤ä·çÍî°Í¸´Ø·¸¤ò´Þ¤á¤¿Á´Ì¾¾Î¤òɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::AllNames .RE .PP \fB\-\-recurse\fR -.RS 3n +.RS 4 depends ¤ä rdepends @@ -283,7 +289,7 @@ APT::Cache::RecurseDepends .RE .PP \fB\-\-installed\fR -.RS 3n +.RS 4 depends ¤ä @@ -293,45 +299,45 @@ APT::Cache::Installed .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/sources.list\fR -.RS 3n +\fI/etc/apt/sources\&.list\fR +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::SourceList .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 \fBsources.list\fR(5) ¤Ë»ØÄꤷ¤¿¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¤´¤È¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists (ɬÁ³Åª¤ËÉÔ´°Á´) @@ -340,39 +346,43 @@ Dir::State::Lists .PP \fBapt.conf\fR(5), \fBsources.list\fR(5), -\fBapt\-get\fR(8) +\fBapt-get\fR(8) .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP \fBapt\-cache\fR ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[2]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[2]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ GraphViz +.SH "NOTES" +.IP " 1." 4 +GraphViz +.RS 4 \%http://www.research.att.com/sw/tools/graphviz/ -.TP 3 -2.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.RE +.IP " 2." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-cache.ja.8 b/doc/ja/apt-cache.ja.8 index ae3fa9e..24d9354 100644 --- a/doc/ja/apt-cache.ja.8 +++ b/doc/ja/apt-cache.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cache +.\" Title: apt-cache .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-cache \- APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ \-\- ¥­¥ã¥Ã¥·¥åÁàºî +apt-cache \- APT ¥Ñ¥Ã¥±¡¼¥¸Áàºî¥æ¡¼¥Æ¥£¥ê¥Æ¥£ -- ¥­¥ã¥Ã¥·¥åÁàºî .SH "SYNOPSIS" .HP 10 \fBapt\-cache\fR [\fB\-hvsn\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[add\ \fIfile\fR...] | [gencaches] | [showpkg\ \fIpkg\fR...] | [showsrc\ \fIpkg\fR...] | [stats] | [dump] | [dumpavail] | [unmet] | [search\ \fIregex\fR] | [show\ \fIpkg\fR...] | [depends\ \fIpkg\fR...] | [rdepends\ \fIpkg\fR...] | [pkgnames\ \fIprefix\fR] | [dotty\ \fIpkg\fR...] | [policy\ \fIpkgs\fR...] | [madison\ \fIpkgs\fR...]} @@ -28,13 +28,13 @@ apt\-cache \- APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP add \fIfile(s)\fR -.RS 3n +.RS 4 add ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ë»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÄɲä·¤Þ¤¹¡£ ¥Ç¥Ð¥Ã¥°ÀìÍѤǤ¹¡£ .RE .PP gencaches -.RS 3n +.RS 4 gencaches ¤Ï¡¢ \fBapt\-get check\fR @@ -45,76 +45,82 @@ gencaches .RE .PP showpkg \fIpkg(s)\fR -.RS 3n +.RS 4 showpkg ¤Ï¡¢ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤ËÎóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ ¸å¤Ë³¤¯°ú¿ô¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¤È¤Ê¤ê¤Þ¤¹¡£ ³Æ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÈÈï°Í¸´Ø·¸¤òÎóµó¤·¡¢ ¤µ¤é¤Ë¤½¤Î³Æ¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ°Í¸´Ø·¸¤òɽ¼¨¤·¤Þ¤¹¡£ (Ä̾ï¤Î) °Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤¬°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò»Ø¤·¤Þ¤¹¡£ ¤Þ¤¿¡¢Èï°Í¸´Ø·¸¤È¤Ï¡¢ÂоݤΥѥ屡¼¥¸¤Ë°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò»Ø¤·¤Þ¤¹¡£ ½¾¤Ã¤Æ¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤ÏËþ¤¿¤µ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢ Èï°Í¸´Ø·¸¤ÏËþ¤¿¤¹É¬ÍפϤ¢¤ê¤Þ¤»¤ó¡£ ¼ÂÎã¤È¤·¤Æ¡¢°Ê²¼¤Ë \fBapt\-cache showpkg libreadline2\fR ¤Î ½ÐÎϤò·Ç¤²¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: libreadline2 -Versions: 2.1\-12(/var/state/apt/lists/foo_Packages), +Versions: 2\&.1\-12(/var/state/apt/lists/foo_Packages), Reverse Depends: libreadlineg2,libreadline2 libreadline2\-altdev,libreadline2 Dependencies: -2.1\-12 \- libc5 (2 5.4.0\-0) ncurses3.0 (0 (null)) +2\&.1\-12 \- libc5 (2 5\&.4\&.0\-0) ncurses3\&.0 (0 (null)) Provides: -2.1\-12 \- +2\&.1\-12 \- Reverse Provides: .fi .RE -¤Ä¤Þ¤ê¡¢libreadline2 ¤Î version 2.1\-12 ¤Ï¡¢ libc5 ¤È ncurses3.0 ¤Ë°Í¸¤·¤Æ¤¤¤Æ¡¢libreadline2 ¤¬Æ°ºî¤¹¤ë¤Ë¤Ï¡¢ ¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤¬È½¤ê¤Þ¤¹¡£ °ìÊý¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï libreadline2 ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£ libreadline2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢libc5, ncurses3.0, ldso ¤ò ¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ ½ÐÎϤλĤê¤ÎÉôʬ¤Î°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Ï¡¢ apt ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÄ´¤Ù¤ë¤Î¤¬ºÇÎɤǤ·¤ç¤¦¡£ +¤Ä¤Þ¤ê¡¢libreadline2 ¤Î version 2\&.1\-12 ¤Ï¡¢ libc5 ¤È ncurses3\&.0 ¤Ë°Í¸¤·¤Æ¤¤¤Æ¡¢libreadline2 ¤¬Æ°ºî¤¹¤ë¤Ë¤Ï¡¢ ¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤¬È½¤ê¤Þ¤¹¡£ °ìÊý¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï libreadline2 ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£ libreadline2 ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢libc5, ncurses3\&.0, ldso ¤ò ¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¤¬¡¢libreadlineg2 ¤È libreadline2\-altdev ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ ½ÐÎϤλĤê¤ÎÉôʬ¤Î°ÕÌ£¤Ë¤Ä¤¤¤Æ¤Ï¡¢ apt ¤Î¥½¡¼¥¹¥³¡¼¥É¤òÄ´¤Ù¤ë¤Î¤¬ºÇÎɤǤ·¤ç¤¦¡£ .RE .PP stats -.RS 3n +.RS 4 stats ¤Ï¥­¥ã¥Ã¥·¥å¤Ë¤Ä¤¤¤Æ¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ ¤½¤ì°Ê¾å¡¢°ú¿ô¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£°Ê²¼¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ -.RS 3n -.TP 3n -\(bu -¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¸ø¼°¤ÎÉáÄ̤Υѥ屡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Ç»ÈÍѤµ¤ì¤¿Ì¾¾Î¤Ç¡¢¤½¤ì¤¬°ìÂаì¤ËÂбþ ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ Âç¿¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤³¤Î¥«¥Æ¥´¥ê¤ËÆþ¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -½ã¿è²¾Áۥѥ屡¼¥¸¤Ï¡¢ ²¾Áۥѥ屡¼¥¸Ì¾¤È¤·¤Æ¤Î¤ß¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸ (²¾Áۥѥ屡¼¥¸Ì¾¤Î¤ß¤ò¡ÖÄ󶡡פ·¡¢ ¼ÂºÝ¤Ë¤Ï¤¤¤«¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤â¤½¤Î̾¾Î¤ò»ý¤¿¤Ê¤¤) ¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï "mail\-transport\-agent" ¤Ï½ã¿è²¾Áۥѥ屡¼¥¸¤Ç¤¹¡£ "mail\-transport\-agent" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¤¬¡¢ "mail\-transport\-agent" ¤È¤¤¤¦Ì¾¾Î¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£ -.TP 3n -\(bu -ñ°ì²¾Áۥѥ屡¼¥¸¤Ï¡¢ ÆÃÄê¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ ¤¿¤À°ì¤Ä¤Î¾ì¹ç¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢"X11\-text\-viewer" ¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹¤¬¡¢"X11\-text\-viewer" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ xless ¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ -.TP 3n -\(bu -Ê£¹ç²¾Áۥѥ屡¼¥¸¤Ï¡¢ ¤½¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤¢¤ë¤«¡¢ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈƱ¤¸²¾Áۥѥ屡¼¥¸Ì¾¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ debconf ¤Ï¼ÂºÝ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤â¤¢¤ê¤Þ¤¹¤¬¡¢ debconf\-tiny ¤Ë¤è¤Ã¤ÆÄ󶡤⤵¤ì¤Æ¤¤¤Þ¤¹¡£ -.TP 3n -\(bu -·çÍî¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢ (¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡£ Ä̾ï¤Ç¤Ï¡¢¹½Ê¸¤¬Ì·½â¤¹¤ë¤È¤³¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤½¤Î¤¿¤á¡¢¤³¤ÎÃͤϺǾ®¤Ç¤â¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤È°ìÃפ·¤Þ¤¹¡£ ¤â¤·Ê£¿ô¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó (Îã "stable" ¤È "unstable" ¤ÎξÊý) ¤òÍøÍѤ·¤¿¾ì¹ç¡¢ ¤³¤ÎÃͤϥѥ屡¼¥¸Ì¾Áí¿ô¤è¤ê¤â¤«¤Ê¤êÂ礭¤¤¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -°Í¸´Ø·¸Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÍ׵ᤵ¤ì¤¿°Í¸´Ø·¸¤Î¿ô¤Ç¤¹¡£ -.RE -.IP "" 3n +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ä̾ï¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¸ø¼°¤ÎÉáÄ̤Υѥ屡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Ç»ÈÍѤµ¤ì¤¿Ì¾¾Î¤Ç¡¢¤½¤ì¤¬°ìÂаì¤ËÂбþ ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£ Âç¿¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤³¤Î¥«¥Æ¥´¥ê¤ËÆþ¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'½ã¿è²¾Áۥѥ屡¼¥¸¤Ï¡¢ ²¾Áۥѥ屡¼¥¸Ì¾¤È¤·¤Æ¤Î¤ß¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸ (²¾Áۥѥ屡¼¥¸Ì¾¤Î¤ß¤ò¡ÖÄ󶡡פ·¡¢ ¼ÂºÝ¤Ë¤Ï¤¤¤«¤Ê¤ë¥Ñ¥Ã¥±¡¼¥¸¤â¤½¤Î̾¾Î¤ò»ý¤¿¤Ê¤¤) ¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï "mail\-transport\-agent" ¤Ï½ã¿è²¾Áۥѥ屡¼¥¸¤Ç¤¹¡£ "mail\-transport\-agent" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¤¬¡¢ "mail\-transport\-agent" ¤È¤¤¤¦Ì¾¾Î¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ñ°ì²¾Áۥѥ屡¼¥¸¤Ï¡¢ ÆÃÄê¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ ¤¿¤À°ì¤Ä¤Î¾ì¹ç¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢"X11\-text\-viewer" ¤Ï²¾Áۥѥ屡¼¥¸¤Ç¤¹¤¬¡¢"X11\-text\-viewer" ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ xless ¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ê£¹ç²¾Áۥѥ屡¼¥¸¤Ï¡¢ ¤½¤Î²¾Áۥѥ屡¼¥¸Ì¾¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬Ê£¿ô¤¢¤ë¤«¡¢ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈƱ¤¸²¾Áۥѥ屡¼¥¸Ì¾¤ò»ý¤Ä¥Ñ¥Ã¥±¡¼¥¸¿ô¤òɽ¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ debconf ¤Ï¼ÂºÝ¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤â¤¢¤ê¤Þ¤¹¤¬¡¢ debconf\-tiny ¤Ë¤è¤Ã¤ÆÄ󶡤⤵¤ì¤Æ¤¤¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'·çÍî¤Ï¡¢°Í¸´Ø·¸Ãæ¤Ë¤Ï¸ºß¤¹¤ë¤Î¤Ë¡¢ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤âÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ Á´¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Æ¤¤¤Ê¤¤¤«¡¢ (¼Â¤Ê¤¤¤·²¾ÁÛ) ¥Ñ¥Ã¥±¡¼¥¸¤¬¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¤Ï¤º¤µ¤ì¤Æ¤·¤Þ¤Ã¤¿²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡£ Ä̾ï¤Ç¤Ï¡¢¹½Ê¸¤¬Ì·½â¤¹¤ë¤È¤³¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¸ÄÊ̥С¼¥¸¥ç¥óÁí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¿ô¤òɽ¤·¤Þ¤¹¡£ ¤½¤Î¤¿¤á¡¢¤³¤ÎÃͤϺǾ®¤Ç¤â¥Ñ¥Ã¥±¡¼¥¸Ì¾Áí¿ô¤È°ìÃפ·¤Þ¤¹¡£ ¤â¤·Ê£¿ô¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó (Îã "stable" ¤È "unstable" ¤ÎξÊý) ¤òÍøÍѤ·¤¿¾ì¹ç¡¢ ¤³¤ÎÃͤϥѥ屡¼¥¸Ì¾Áí¿ô¤è¤ê¤â¤«¤Ê¤êÂ礭¤¤¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'°Í¸´Ø·¸Áí¿ô¤Ï¡¢ ¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÇÍ׵ᤵ¤ì¤¿°Í¸´Ø·¸¤Î¿ô¤Ç¤¹¡£ +.RE +.IP "" 4 .RE .PP showsrc \fIpkg(s)\fR -.RS 3n +.RS 4 showsrc ¤Ï¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë°ìÃפ¹¤ë¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£ ¥Ð¥¤¥Ê¥ê¤Ë¤Ê¤ë¤È¤­¤Î̾¾Î¤òÀë¸À¤·¤¿¥ì¥³¡¼¥É¤ÈƱÍͤˡ¢ ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æɽ¼¨¤·¤Þ¤¹¡£ .RE .PP dump -.RS 3n +.RS 4 dump ¤Ï¡¢ ¥­¥ã¥Ã¥·¥åÆâ¤Î¥Ñ¥Ã¥±¡¼¥¸¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ¡¢Ã»¤¤°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ ¼ç¤Ë¥Ç¥Ð¥Ã¥°ÍѤǤ¹¡£ .RE .PP dumpavail -.RS 3n +.RS 4 dumpavail ¤Ï¡¢ ɸ½à½ÐÎϤËÍøÍѲÄǽ¤Ê¤â¤Î¤Î°ìÍ÷¤ò½ÐÎϤ·¤Þ¤¹¡£ \fBdpkg\fR(8) @@ -124,21 +130,21 @@ dumpavail .RE .PP unmet -.RS 3n +.RS 4 unmet ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥åÆâ¤Ë¤¢¤ë¡¢ ÉÔŬÅö¤Ê°Í¸´Ø·¸¤Î³µÍפòɽ¼¨¤·¤Þ¤¹¡£ .RE .PP show \fIpkg(s)\fR -.RS 3n +.RS 4 show ¤Ï¡¢ \fBdpkg \-\-print\-avail\fR ¤ÈƱÍͤε¡Ç½¤ò¼Â¹Ô¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤Îɽ¼¨¤Ç¤¹¡£ .RE .PP -search \fIregex [ regex ... ]\fR -.RS 3n +search \fIregex [ regex \&.\&.\&. ]\fR +.RS 4 search ¤Ï¡¢Í¿¤¨¤é¤ì¤¿Àµµ¬É½¸½¤Ë¤è¤Ã¤Æ¡¢ ¤¹¤Ù¤Æ¤ÎÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¤ÆÁ´Ê¸¸¡º÷¤ò¹Ô¤¤¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ÈÀâÌÀ¤ËÂФ·¤Æ¸¡º÷¤ò¹Ô¤¤¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Èû¤¤ÀâÌÀʸ¤òɽ¼¨¤·¤Þ¤¹¡£ \fB\-\-full\fR @@ -153,29 +159,29 @@ show .RE .PP depends \fIpkg(s)\fR -.RS 3n +.RS 4 depends ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬»ý¤Ã¤Æ¤¤¤ë°Í¸´Ø·¸¤È¡¢ ¤½¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹Â¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP rdepends \fIpkg(s)\fR -.RS 3n +.RS 4 rdepends ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬»ý¤ÄÈï°Í¸´Ø·¸¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ .RE .PP pkgnames \fI[ prefix ]\fR -.RS 3n +.RS 4 ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç¤Î³Æ¥Ñ¥Ã¥±¡¼¥¸¤Î̾¾Î¤òɽ¼¨¤·¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤Ë¤è¤ê¡¢¼èÆÀ¤¹¤ë°ìÍ÷¤è¤êÀèƬ°ìÃפÇÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤³¤Î½ÐÎϤϥ·¥§¥ë¤Î¥¿¥Ö¤Ë¤è¤ëÊä´°µ¡Ç½¤Ë»È¤¤¤ä¤¹¤¯¡¢ ¤Þ¤¿Èó¾ï¤Ë®¤¯À¸À®¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï \fB\-\-generate\fR ¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍѤ¹¤ë¤È¡¢ Èó¾ï¤ËÊØÍø¤Ç¤¹¡£ .RE .PP dotty \fIpkg(s)\fR -.RS 3n +.RS 4 dotty ¤Ï¡¢ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¡¢ -[1]\&\fIGraphViz\fR +\fIGraphViz\fR\&[1] ¥Ñ¥Ã¥±¡¼¥¸¤Î dotty ¥³¥Þ¥ó¥É¤ÇÍøÍѤ¹¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡£ ·ë²Ì¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î´Ø·¸¤òɽ¤ï¤¹¡¢¥Î¡¼¥É¡¦¥¨¥Ã¥¸¤Î¥»¥Ã¥È¤Çɽ¸½¤µ¤ì¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î°Í¸¥Ñ¥Ã¥±¡¼¥¸¤ò¥È¥ì¡¼¥¹¤¹¤ë¤Î¤Ç¡¢ Èó¾ï¤ËÂ礭¤¤¿Þ¤¬ÆÀ¤é¤ì¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢APT::Cache::GivenOnly ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Æ²ò½ü¤Ç¤­¤Þ¤¹¡£ .sp @@ -185,13 +191,13 @@ dotty .RE .PP policy \fI[ pkg(s) ]\fR -.RS 3n +.RS 4 policy ¤Ï¡¢ ÀßÄê¥Õ¥¡¥¤¥ë´Ø·¸¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¡¢¥Ç¥Ð¥Ã¥°¤ò»Ù±ç¤·¤Þ¤¹¡£ °ú¿ô¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¼èÆÀ¸µ¤´¤È¤ÎÍ¥Àè½ç°Ì¤òɽ¼¨¤·¤Þ¤¹¡£ °ìÊý¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤷ¤¿¾ì¹ç¡¢ Í¥Àè½ç¤Î¾ÜºÙ¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP madison \fI/[ pkg(s) ]\fR -.RS 3n +.RS 4 apt\-cache ¤Î madison @@ -209,13 +215,13 @@ madison ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-p\fR, \fB\-\-pkg\-cache\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Ï¡¢¤¹¤Ù¤Æ¤ÎÁàºî¤Ç»ÈÍѤµ¤ì¤ë°ì¼¡¥­¥ã¥Ã¥·¥å¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- Dir::Cache::pkgcache .RE .PP \fB\-s\fR, \fB\-\-src\-cache\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤ò³ÊǼ¤¹¤ë¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£ ¤³¤Î¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï gencaches ¤Ç¤Î¤ß»ÈÍѤµ¤ì¡¢ ¤³¤³¤Ë²òÀϤµ¤ì¤¿¼èÆÀ¸µ¤Î¥Ñ¥Ã¥±¡¼¥¸¾ðÊ󤬳ÊǼ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë¡¢¥½¡¼¥¹¥­¥ã¥Ã¥·¥å¤Ï¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òºÆ²òÀϤòÈò¤±¤ë¾å¤ÇÊØÍø¤Ç¤¹¡£ @@ -224,26 +230,26 @@ Dir::Cache::srcpkgcache .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢ ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤µ¤é¤ËÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- quiet .RE .PP \fB\-i\fR, \fB\-\-important\fR -.RS 3n +.RS 4 ¡Ö½ÅÍסװ͸´Ø·¸¤Î¤ßɽ¼¨ \- unmet ¤È¶¦¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡Ö°Í¸¡×´Ø·¸¤È¡ÖÀè¹Ô°Í¸¡×´Ø·¸¤Î¤ß¤òɽ¼¨¤¹¤ë¤¿¤á¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::Important .RE .PP \fB\-f\fR, \fB\-\-full\fR -.RS 3n +.RS 4 search »þ¤ËÁ´¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::ShowFull .RE .PP \fB\-a\fR, \fB\-\-all\-versions\fR -.RS 3n +.RS 4 Á´ÍøÍѲÄǽ¥Ð¡¼¥¸¥ç¥ó¤Î¥ì¥³¡¼¥ÉÁ´ÂΤòɽ¼¨¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¡¢ ̵¸ú¤Ë¤¹¤ë¤Ë¤Ï \fB\-\-no\-all\-versions\fR ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ @@ -253,7 +259,7 @@ APT::Cache::AllVersions .RE .PP \fB\-g\fR, \fB\-\-generate\fR -.RS 3n +.RS 4 ¤½¤Î¤Þ¤Þ¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢ ¼«Æ°Åª¤Ë¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤òºÆÀ¸À®¤·¤Þ¤¹¡£¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¡¢ ̵¸ú¤Ë¤¹¤ë¤Ë¤Ï \fB\-\-no\-generate\fR ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ ÀßÄê¹àÌÜ \- @@ -261,20 +267,20 @@ APT::Cache::Generate .RE .PP \fB\-\-names\-only\fR, \fB\-n\fR -.RS 3n +.RS 4 ÀâÌÀʸ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤«¤é¤Î¤ß¸¡º÷¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::NamesOnly .RE .PP \fB\-\-all\-names\fR -.RS 3n +.RS 4 pkgnames ¤Ç¡¢ ²¾Áۥѥ屡¼¥¸¤ä·çÍî°Í¸´Ø·¸¤ò´Þ¤á¤¿Á´Ì¾¾Î¤òɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Cache::AllNames .RE .PP \fB\-\-recurse\fR -.RS 3n +.RS 4 depends ¤ä rdepends @@ -283,7 +289,7 @@ APT::Cache::RecurseDepends .RE .PP \fB\-\-installed\fR -.RS 3n +.RS 4 depends ¤ä @@ -293,45 +299,45 @@ APT::Cache::Installed .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/sources.list\fR -.RS 3n +\fI/etc/apt/sources\&.list\fR +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::SourceList .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 \fBsources.list\fR(5) ¤Ë»ØÄꤷ¤¿¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¤´¤È¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists (ɬÁ³Åª¤ËÉÔ´°Á´) @@ -340,39 +346,43 @@ Dir::State::Lists .PP \fBapt.conf\fR(5), \fBsources.list\fR(5), -\fBapt\-get\fR(8) +\fBapt-get\fR(8) .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP \fBapt\-cache\fR ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[2]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[2]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ GraphViz +.SH "NOTES" +.IP " 1." 4 +GraphViz +.RS 4 \%http://www.research.att.com/sw/tools/graphviz/ -.TP 3 -2.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.RE +.IP " 2." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-cdrom.8 b/doc/ja/apt-cdrom.8 index 2046bc3..81d568d 100644 --- a/doc/ja/apt-cdrom.8 +++ b/doc/ja/apt-cdrom.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cdrom +.\" Title: apt-cdrom .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-cdrom \- APT CDROM ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-cdrom \- APT CDROM ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 10 \fBapt\-cdrom\fR [\fB\-hvrmfan\fR] [\fB\-d=\fR\fB\fIcdrom\ mount\ point\fR\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] [[add] | [ident]] @@ -32,19 +32,19 @@ APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP add -.RS 3n +.RS 4 add ¤Ï¡¢ ¿·¤·¤¤¥Ç¥£¥¹¥¯¤ò¼èÆÀ¸µ¥ê¥¹¥È¤ËÄɲä·¤Þ¤¹¡£ CDROM ¥Ç¥Ð¥¤¥¹¤Î¥¢¥ó¥Þ¥¦¥ó¥È¡¢¥Ç¥£¥¹¥¯ÁÞÆþ¤Î¥×¥í¥ó¥×¥È¤Îɽ¼¨¤Î¸å¤Ë¡¢ ¥Ç¥£¥¹¥¯¤Î¥¹¥­¥ã¥ó¤È¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò¹Ô¤¤¤Þ¤¹¡£ ¥Ç¥£¥¹¥¯¤ËÀµ¤·¤¤ \fIdisk\fR ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢ ¥¿¥¤¥È¥ë¤òÆþÎϤ¹¤ë¤è¤¦Â¥¤·¤Þ¤¹¡£ .sp APT ¤Ï¡¢¸½ºß¥É¥é¥¤¥Ö¤Ë¤¢¤ë¥Ç¥£¥¹¥¯¤Î¥È¥é¥Ã¥¯¤«¤é¼èÆÀ¤·¤¿¡¢ CDROM ID ¤ò»ÈÍѤ·¤Þ¤¹¡£¤Þ¤¿¤½¤Î ID ¤ò¡¢ -\fI/var/lib/apt/cdroms.list\fR +\fI/var/lib/apt/cdroms\&.list\fR Æâ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç´ÉÍý¤·¤Þ¤¹¡£ .RE .PP ident -.RS 3n +.RS 4 ³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë̾¤È¡¢ ¸½ºß¤Î¥Ç¥£¥¹¥¯¤¬Æ±°ì¤«¤É¤¦¤«¤ò¥ì¥Ý¡¼¥È¤¹¤ë¡¢¥Ç¥Ð¥Ã¥°¥Ä¡¼¥ë¤Ç¤¹¡£ .RE .SH "OPTIONS" @@ -55,7 +55,7 @@ ident ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-d\fR, \fB\-\-cdrom\fR -.RS 3n +.RS 4 ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È \- cdrom ¤ò¥Þ¥¦¥ó¥È¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ï¡¢ \fI/etc/fstab\fR ¤ËÀµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -63,7 +63,7 @@ Acquire::cdrom::mount .RE .PP \fB\-r\fR, \fB\-\-rename\fR -.RS 3n +.RS 4 ¥Ç¥£¥¹¥¯¤Î̾Á°Êѹ¹ \- »ØÄꤷ¤¿Ì¾Á°¤Ç¥Ç¥£¥¹¥¯¤Î¥é¥Ù¥ë¤òÊѹ¹¡¦¹¹¿·¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢ \fBapt\-cdrom\fR ¤¬¿·¤·¤¤¥é¥Ù¥ë¤òÆþÎϤ¹¤ë¤è¤¦Â¥¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -71,7 +71,7 @@ APT::CDROM::Rename .RE .PP \fB\-m\fR, \fB\-\-no\-mount\fR -.RS 3n +.RS 4 ¥Þ¥¦¥ó¥È¤Ê¤· \- \fBapt\-cdrom\fR ¤¬¡¢ ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ë¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -79,7 +79,7 @@ APT::CDROM::NoMount .RE .PP \fB\-f\fR, \fB\-\-fast\fR -.RS 3n +.RS 4 ¹â®¥³¥Ô¡¼ \- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬ÂÅÅö¤Ç¤¢¤ë¤È²¾Äꤷ¡¢ ¥Á¥§¥Ã¥¯¤òÁ´¤¯¹Ô¤¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¤³¤Î¥Ç¥£¥¹¥¯¤Ç°ÊÁ° \fBapt\-cdrom\fR ¤ò¹Ô¤Ã¤Æ¤ª¤ê¡¢ ¥¨¥é¡¼¤ò¸¡½Ð¤·¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¤ß»ÈÍѤ¹¤Ù¤­¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- @@ -87,12 +87,12 @@ APT::CDROM::Fast .RE .PP \fB\-a\fR, \fB\-\-thorough\fR -.RS 3n -´°Á´¥Ñ¥Ã¥±¡¼¥¸¥¹¥­¥ã¥ó \- ¸Å¤¤ Debian 1.1/1.2 ¤Î¥Ç¥£¥¹¥¯¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬°ã¤¦¾ì½ê¤Ë¤¢¤ë¤¿¤á¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦É¬Íפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ CD ¤ò¥¹¥­¥ã¥ó¤¹¤ë¤Î¤ËÈó¾ï¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +.RS 4 +´°Á´¥Ñ¥Ã¥±¡¼¥¸¥¹¥­¥ã¥ó \- ¸Å¤¤ Debian 1\&.1/1\&.2 ¤Î¥Ç¥£¥¹¥¯¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬°ã¤¦¾ì½ê¤Ë¤¢¤ë¤¿¤á¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦É¬Íפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ CD ¤ò¥¹¥­¥ã¥ó¤¹¤ë¤Î¤ËÈó¾ï¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .RE .PP \fB\-n\fR, \fB\-\-just\-print\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n +.RS 4 Êѹ¹¤Ê¤· \- \fBsources.list\fR(5) ¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤ä¡¢ ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ¤È¤Ï¤¤¤¨¡¢¤¹¤Ù¤Æ¤Î¥Á¥§¥Ã¥¯¤Ï¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -100,24 +100,24 @@ APT::CDROM::NoAct .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -125,7 +125,7 @@ APT::CDROM::NoAct .SH "´ØÏ¢¹àÌÜ" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBsources.list\fR(5) .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP @@ -133,29 +133,31 @@ APT::CDROM::NoAct ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-cdrom.ja.8 b/doc/ja/apt-cdrom.ja.8 index 2046bc3..81d568d 100644 --- a/doc/ja/apt-cdrom.ja.8 +++ b/doc/ja/apt-cdrom.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-cdrom +.\" Title: apt-cdrom .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-cdrom \- APT CDROM ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-cdrom \- APT CDROM ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 10 \fBapt\-cdrom\fR [\fB\-hvrmfan\fR] [\fB\-d=\fR\fB\fIcdrom\ mount\ point\fR\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] [[add] | [ident]] @@ -32,19 +32,19 @@ APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP add -.RS 3n +.RS 4 add ¤Ï¡¢ ¿·¤·¤¤¥Ç¥£¥¹¥¯¤ò¼èÆÀ¸µ¥ê¥¹¥È¤ËÄɲä·¤Þ¤¹¡£ CDROM ¥Ç¥Ð¥¤¥¹¤Î¥¢¥ó¥Þ¥¦¥ó¥È¡¢¥Ç¥£¥¹¥¯ÁÞÆþ¤Î¥×¥í¥ó¥×¥È¤Îɽ¼¨¤Î¸å¤Ë¡¢ ¥Ç¥£¥¹¥¯¤Î¥¹¥­¥ã¥ó¤È¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò¹Ô¤¤¤Þ¤¹¡£ ¥Ç¥£¥¹¥¯¤ËÀµ¤·¤¤ \fIdisk\fR ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢ ¥¿¥¤¥È¥ë¤òÆþÎϤ¹¤ë¤è¤¦Â¥¤·¤Þ¤¹¡£ .sp APT ¤Ï¡¢¸½ºß¥É¥é¥¤¥Ö¤Ë¤¢¤ë¥Ç¥£¥¹¥¯¤Î¥È¥é¥Ã¥¯¤«¤é¼èÆÀ¤·¤¿¡¢ CDROM ID ¤ò»ÈÍѤ·¤Þ¤¹¡£¤Þ¤¿¤½¤Î ID ¤ò¡¢ -\fI/var/lib/apt/cdroms.list\fR +\fI/var/lib/apt/cdroms\&.list\fR Æâ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç´ÉÍý¤·¤Þ¤¹¡£ .RE .PP ident -.RS 3n +.RS 4 ³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë̾¤È¡¢ ¸½ºß¤Î¥Ç¥£¥¹¥¯¤¬Æ±°ì¤«¤É¤¦¤«¤ò¥ì¥Ý¡¼¥È¤¹¤ë¡¢¥Ç¥Ð¥Ã¥°¥Ä¡¼¥ë¤Ç¤¹¡£ .RE .SH "OPTIONS" @@ -55,7 +55,7 @@ ident ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-d\fR, \fB\-\-cdrom\fR -.RS 3n +.RS 4 ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È \- cdrom ¤ò¥Þ¥¦¥ó¥È¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ï¡¢ \fI/etc/fstab\fR ¤ËÀµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -63,7 +63,7 @@ Acquire::cdrom::mount .RE .PP \fB\-r\fR, \fB\-\-rename\fR -.RS 3n +.RS 4 ¥Ç¥£¥¹¥¯¤Î̾Á°Êѹ¹ \- »ØÄꤷ¤¿Ì¾Á°¤Ç¥Ç¥£¥¹¥¯¤Î¥é¥Ù¥ë¤òÊѹ¹¡¦¹¹¿·¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢ \fBapt\-cdrom\fR ¤¬¿·¤·¤¤¥é¥Ù¥ë¤òÆþÎϤ¹¤ë¤è¤¦Â¥¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -71,7 +71,7 @@ APT::CDROM::Rename .RE .PP \fB\-m\fR, \fB\-\-no\-mount\fR -.RS 3n +.RS 4 ¥Þ¥¦¥ó¥È¤Ê¤· \- \fBapt\-cdrom\fR ¤¬¡¢ ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤Ë¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -79,7 +79,7 @@ APT::CDROM::NoMount .RE .PP \fB\-f\fR, \fB\-\-fast\fR -.RS 3n +.RS 4 ¹â®¥³¥Ô¡¼ \- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬ÂÅÅö¤Ç¤¢¤ë¤È²¾Äꤷ¡¢ ¥Á¥§¥Ã¥¯¤òÁ´¤¯¹Ô¤¤¤Þ¤»¤ó¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¤³¤Î¥Ç¥£¥¹¥¯¤Ç°ÊÁ° \fBapt\-cdrom\fR ¤ò¹Ô¤Ã¤Æ¤ª¤ê¡¢ ¥¨¥é¡¼¤ò¸¡½Ð¤·¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¤ß»ÈÍѤ¹¤Ù¤­¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- @@ -87,12 +87,12 @@ APT::CDROM::Fast .RE .PP \fB\-a\fR, \fB\-\-thorough\fR -.RS 3n -´°Á´¥Ñ¥Ã¥±¡¼¥¸¥¹¥­¥ã¥ó \- ¸Å¤¤ Debian 1.1/1.2 ¤Î¥Ç¥£¥¹¥¯¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬°ã¤¦¾ì½ê¤Ë¤¢¤ë¤¿¤á¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦É¬Íפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ CD ¤ò¥¹¥­¥ã¥ó¤¹¤ë¤Î¤ËÈó¾ï¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +.RS 4 +´°Á´¥Ñ¥Ã¥±¡¼¥¸¥¹¥­¥ã¥ó \- ¸Å¤¤ Debian 1\&.1/1\&.2 ¤Î¥Ç¥£¥¹¥¯¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬°ã¤¦¾ì½ê¤Ë¤¢¤ë¤¿¤á¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦É¬Íפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ CD ¤ò¥¹¥­¥ã¥ó¤¹¤ë¤Î¤ËÈó¾ï¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢ Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÃê½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .RE .PP \fB\-n\fR, \fB\-\-just\-print\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n +.RS 4 Êѹ¹¤Ê¤· \- \fBsources.list\fR(5) ¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤ä¡¢ ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ¤È¤Ï¤¤¤¨¡¢¤¹¤Ù¤Æ¤Î¥Á¥§¥Ã¥¯¤Ï¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -100,24 +100,24 @@ APT::CDROM::NoAct .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -125,7 +125,7 @@ APT::CDROM::NoAct .SH "´ØÏ¢¹àÌÜ" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBsources.list\fR(5) .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP @@ -133,29 +133,31 @@ APT::CDROM::NoAct ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-config.8 b/doc/ja/apt-config.8 index b92f860..fdeb697 100644 --- a/doc/ja/apt-config.8 +++ b/doc/ja/apt-config.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-config +.\" Title: apt-config .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-config \- APT ÀßÄê¼èÆÀ¥×¥í¥°¥é¥à +apt-config \- APT ÀßÄê¼èÆÀ¥×¥í¥°¥é¥à .SH "SYNOPSIS" .HP 11 \fBapt\-config\fR [\fB\-hv\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[shell] | [dump]} @@ -19,7 +19,7 @@ apt\-config \- APT .PP \fBapt\-config\fR ¤Ï¡¢ APT ¥¹¥¤¡¼¥È¤ÎÍÍ¡¹¤Ê½ê¤Ç°ì´Ó¤·¤¿ÀßÄê¤ò¹Ô¤¦¤¿¤á¤Ë»ÈÍѤ¹¤ë¡¢ÆâÉô¥Ä¡¼¥ë¤Ç¤¹¡£ ¥¹¥¯¥ê¥×¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç»È¤¤¤ä¤¹¤¤ÊýË¡¤Ç¡¢ ¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£ .PP \fB\-h\fR @@ -28,11 +28,11 @@ apt\-config \- APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP shell -.RS 3n +.RS 4 shell ¤Ï¡¢¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤«¤éÀßÄê¾ðÊó¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ °ú¿ô¤È¤·¤Æ¡¢¤Þ¤º¥·¥§¥ëÊÑ¿ô¡¢¼¡¤Ë¼èÆÀ¤·¤¿¤¤ÀßÄêÃͤò¥Ú¥¢¤ÇÍ¿¤¨¤Þ¤¹¡£ ½ÐÎϤȤ·¤Æ¡¢¸½ºß¤ÎÃͤ´¤È¤Ë¥·¥§¥ëÂåÆþ¥³¥Þ¥ó¥É¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ ¥·¥§¥ë¥¹¥¯¥ê¥×¥ÈÆâ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ .sp -.RS 3n +.RS 4 .nf OPTS="\-f" RES=`apt\-config shell OPTS MyApp::options` @@ -47,7 +47,7 @@ eval $RES .RE .PP dump -.RS 3n +.RS 4 ÀßÄê²Õ½ê¤ÎÆâÍƤòɽ¼¨¤¹¤ë¤À¤±¤Ç¤¹¡£ .RE @@ -59,24 +59,24 @@ dump ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -90,29 +90,31 @@ dump ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-config.ja.8 b/doc/ja/apt-config.ja.8 index b92f860..fdeb697 100644 --- a/doc/ja/apt-config.ja.8 +++ b/doc/ja/apt-config.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-config +.\" Title: apt-config .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-config \- APT ÀßÄê¼èÆÀ¥×¥í¥°¥é¥à +apt-config \- APT ÀßÄê¼èÆÀ¥×¥í¥°¥é¥à .SH "SYNOPSIS" .HP 11 \fBapt\-config\fR [\fB\-hv\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[shell] | [dump]} @@ -19,7 +19,7 @@ apt\-config \- APT .PP \fBapt\-config\fR ¤Ï¡¢ APT ¥¹¥¤¡¼¥È¤ÎÍÍ¡¹¤Ê½ê¤Ç°ì´Ó¤·¤¿ÀßÄê¤ò¹Ô¤¦¤¿¤á¤Ë»ÈÍѤ¹¤ë¡¢ÆâÉô¥Ä¡¼¥ë¤Ç¤¹¡£ ¥¹¥¯¥ê¥×¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç»È¤¤¤ä¤¹¤¤ÊýË¡¤Ç¡¢ ¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£ .PP \fB\-h\fR @@ -28,11 +28,11 @@ apt\-config \- APT ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP shell -.RS 3n +.RS 4 shell ¤Ï¡¢¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤«¤éÀßÄê¾ðÊó¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ °ú¿ô¤È¤·¤Æ¡¢¤Þ¤º¥·¥§¥ëÊÑ¿ô¡¢¼¡¤Ë¼èÆÀ¤·¤¿¤¤ÀßÄêÃͤò¥Ú¥¢¤ÇÍ¿¤¨¤Þ¤¹¡£ ½ÐÎϤȤ·¤Æ¡¢¸½ºß¤ÎÃͤ´¤È¤Ë¥·¥§¥ëÂåÆþ¥³¥Þ¥ó¥É¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ ¥·¥§¥ë¥¹¥¯¥ê¥×¥ÈÆâ¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ .sp -.RS 3n +.RS 4 .nf OPTS="\-f" RES=`apt\-config shell OPTS MyApp::options` @@ -47,7 +47,7 @@ eval $RES .RE .PP dump -.RS 3n +.RS 4 ÀßÄê²Õ½ê¤ÎÆâÍƤòɽ¼¨¤¹¤ë¤À¤±¤Ç¤¹¡£ .RE @@ -59,24 +59,24 @@ dump ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -90,29 +90,31 @@ dump ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-extracttemplates.1 b/doc/ja/apt-extracttemplates.1 index f099574..a71e627 100644 --- a/doc/ja/apt-extracttemplates.1 +++ b/doc/ja/apt-extracttemplates.1 @@ -1,17 +1,17 @@ -.\" Title: apt\-extracttemplates +.\" Title: apt-extracttemplates .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT\-EXTRACTTEMPLATES" "1" "29 February 2004" "Linux" "" +.TH "APT\-EXTRACTTEMPLATE" "1" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-extracttemplates \- Debian ¥Ñ¥Ã¥±¡¼¥¸¤«¤é DebConf ÀßÄê¤È¥Æ¥ó¥×¥ì¡¼¥È¤òÃê½Ð¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-extracttemplates \- Debian ¥Ñ¥Ã¥±¡¼¥¸¤«¤é DebConf ÀßÄê¤È¥Æ¥ó¥×¥ì¡¼¥È¤òÃê½Ð¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 21 \fBapt\-extracttemplates\fR [\fB\-hv\fR] [\fB\-t=\fR\fB\fItemporary\ directory\fR\fR] \fIfile\fR... @@ -22,9 +22,9 @@ apt\-extracttemplates \- Debian .PP package version template\-file config\-script .PP -¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤ä¡¢ÀßÄꥹ¥¯¥ê¥×¥È¤Ï¡¢ \-t ¤ä \-\-tempdir ¤Ç»ØÄꤷ¤¿°ì»þ¥Ç¥£¥ì¥¯¥È¥ê (APT::ExtractTemplates::TempDir) ¤Ë½ñ¤­½Ð¤µ¤ì¡¢ ¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fIpackage.template.XXXX\fR +¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤ä¡¢ÀßÄꥹ¥¯¥ê¥×¥È¤Ï¡¢ \-t ¤ä \-\-tempdir ¤Ç»ØÄꤷ¤¿°ì»þ¥Ç¥£¥ì¥¯¥È¥ê (APT::ExtractTemplates::TempDir) ¤Ë½ñ¤­½Ð¤µ¤ì¡¢ ¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fIpackage\&.template\&.XXXX\fR ¤ä -\fIpackage.config.XXXX\fR +\fIpackage\&.config\&.XXXX\fR ¤È¸À¤Ã¤¿·Á¤Ë¤Ê¤ê¤Þ¤¹¡£ .SH "¥ª¥×¥·¥ç¥ó" .PP @@ -34,30 +34,30 @@ package version template\-file config\-script ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-t\fR, \fB\-\-tempdir\fR -.RS 3n +.RS 4 Ãê½Ð¤·¤¿ debconf ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤äÀßÄꥹ¥¯¥ê¥×¥È¤ò½ñ¤­½Ð¤¹¡¢ °ì»þ¥Ç¥£¥ì¥¯¥È¥ê¡£ ÀßÄê¹àÌÜ \- APT::ExtractTemplates::TempDir .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -71,29 +71,31 @@ APT::ExtractTemplates::TempDir ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-extracttemplates.ja.1 b/doc/ja/apt-extracttemplates.ja.1 index f099574..a71e627 100644 --- a/doc/ja/apt-extracttemplates.ja.1 +++ b/doc/ja/apt-extracttemplates.ja.1 @@ -1,17 +1,17 @@ -.\" Title: apt\-extracttemplates +.\" Title: apt-extracttemplates .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT\-EXTRACTTEMPLATES" "1" "29 February 2004" "Linux" "" +.TH "APT\-EXTRACTTEMPLATE" "1" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-extracttemplates \- Debian ¥Ñ¥Ã¥±¡¼¥¸¤«¤é DebConf ÀßÄê¤È¥Æ¥ó¥×¥ì¡¼¥È¤òÃê½Ð¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-extracttemplates \- Debian ¥Ñ¥Ã¥±¡¼¥¸¤«¤é DebConf ÀßÄê¤È¥Æ¥ó¥×¥ì¡¼¥È¤òÃê½Ð¤¹¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 21 \fBapt\-extracttemplates\fR [\fB\-hv\fR] [\fB\-t=\fR\fB\fItemporary\ directory\fR\fR] \fIfile\fR... @@ -22,9 +22,9 @@ apt\-extracttemplates \- Debian .PP package version template\-file config\-script .PP -¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤ä¡¢ÀßÄꥹ¥¯¥ê¥×¥È¤Ï¡¢ \-t ¤ä \-\-tempdir ¤Ç»ØÄꤷ¤¿°ì»þ¥Ç¥£¥ì¥¯¥È¥ê (APT::ExtractTemplates::TempDir) ¤Ë½ñ¤­½Ð¤µ¤ì¡¢ ¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fIpackage.template.XXXX\fR +¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤ä¡¢ÀßÄꥹ¥¯¥ê¥×¥È¤Ï¡¢ \-t ¤ä \-\-tempdir ¤Ç»ØÄꤷ¤¿°ì»þ¥Ç¥£¥ì¥¯¥È¥ê (APT::ExtractTemplates::TempDir) ¤Ë½ñ¤­½Ð¤µ¤ì¡¢ ¥Õ¥¡¥¤¥ë̾¤Ï¡¢\fIpackage\&.template\&.XXXX\fR ¤ä -\fIpackage.config.XXXX\fR +\fIpackage\&.config\&.XXXX\fR ¤È¸À¤Ã¤¿·Á¤Ë¤Ê¤ê¤Þ¤¹¡£ .SH "¥ª¥×¥·¥ç¥ó" .PP @@ -34,30 +34,30 @@ package version template\-file config\-script ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-t\fR, \fB\-\-tempdir\fR -.RS 3n +.RS 4 Ãê½Ð¤·¤¿ debconf ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë¤äÀßÄꥹ¥¯¥ê¥×¥È¤ò½ñ¤­½Ð¤¹¡¢ °ì»þ¥Ç¥£¥ì¥¯¥È¥ê¡£ ÀßÄê¹àÌÜ \- APT::ExtractTemplates::TempDir .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -71,29 +71,31 @@ APT::ExtractTemplates::TempDir ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-ftparchive.1 b/doc/ja/apt-ftparchive.1 index 6501838..5e1a6df 100644 --- a/doc/ja/apt-ftparchive.1 +++ b/doc/ja/apt-ftparchive.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-ftparchive +.\" Title: apt-ftparchive .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-ftparchive \- ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÀ¸À®¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-ftparchive \- ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÀ¸À®¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 15 \fBapt\-ftparchive\fR [\fB\-hvdsq\fR] [\fB\-\-md5\fR] [\fB\-\-delink\fR] [\fB\-\-readonly\fR] [\fB\-\-contents\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[packages\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [sources\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [contents\ \fIpath\fR] | [release\ \fIpath\fR] | [generate\ \fIconfig\-file\fR\ \fIsection\fR...] | [clean\ \fIconfig\-file\fR]} @@ -22,7 +22,7 @@ apt\-ftparchive \- .PP \fBapt\-ftparchive\fR ¤Ï¡¢ -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) ¥×¥í¥°¥é¥à¤Î¥¹¡¼¥Ñ¡¼¥»¥Ã¥È¤Ç¡¢ packages ¥³¥Þ¥ó¥É·Ðͳ¤Çµ¡Ç½Á´ÂΤò¼è¤ê¹þ¤ó¤Ç¤¤¤Þ¤¹¡£ ¤Þ¤¿¡¢contents ¥Õ¥¡¥¤¥ë¥¸¥§¥Í¥ì¡¼¥¿ @@ -31,7 +31,7 @@ contents .PP ËܼÁŪ¤Ë \fBapt\-ftparchive\fR -¤Ï¡¢ .deb ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¥­¥ã¥Ã¥·¥å¤¹¤ë¤Î¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fBgzip\fR(1) +¤Ï¡¢ \&.deb ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¥­¥ã¥Ã¥·¥å¤¹¤ë¤Î¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fBgzip\fR(1) °Ê³°¤Î¤¤¤«¤Ê¤ë³°Éô¥×¥í¥°¥é¥à¤Ë¤â°Í¸¤·¤Þ¤»¤ó¡£ ¤¹¤Ù¤ÆÀ¸À®¤¹¤ëºÝ¤Ë¤Ï¡¢ ¥Õ¥¡¥¤¥ëÊѹ¹ÅÀ¤Î¸¡½Ð¤È´õ˾¤·¤¿°µ½Ì½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤ò¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Þ¤¹¡£ .PP \fB\-h\fR @@ -40,9 +40,9 @@ contents ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP packages -.RS 3n +.RS 4 -packages ¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg\-scanpackages\fR(8) +packages ¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg-scanpackages\fR(8) ¤È¤Û¤ÜƱ¤¸¤Ç¤¹¡£ .sp \fB\-\-db\fR @@ -50,11 +50,11 @@ packages .RE .PP sources -.RS 3n +.RS 4 sources -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.dsc ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥½¡¼¥¹¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg\-scansources\fR(8) +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.dsc ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥½¡¼¥¹¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg-scansources\fR(8) ¤È¤Û¤ÜƱ¤¸¤Ç¤¹¡£ .sp @@ -62,11 +62,11 @@ override .RE .PP contents -.RS 3n +.RS 4 contents -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥³¥ó¥Æ¥ó¥Ä¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Õ¥¡¥¤¥ë¤´¤È¤Ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òÆɤ߼è¤ê¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Ñ¥Ã¥±¡¼¥¸¤ËÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òɸ½à½ÐÎϤ˥½¡¼¥È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡£ ¥Ç¥£¥ì¥¯¥È¥ê¤Ï½ÐÎϤ˴ޤޤì¤Þ¤»¤ó¡£ Ê£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¾ì¹ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¥«¥ó¥Þ¶èÀÚ¤ê¤Ç½ÐÎϤ·¤Þ¤¹¡£ +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥³¥ó¥Æ¥ó¥Ä¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Õ¥¡¥¤¥ë¤´¤È¤Ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òÆɤ߼è¤ê¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Ñ¥Ã¥±¡¼¥¸¤ËÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òɸ½à½ÐÎϤ˥½¡¼¥È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡£ ¥Ç¥£¥ì¥¯¥È¥ê¤Ï½ÐÎϤ˴ޤޤì¤Þ¤»¤ó¡£ Ê£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¾ì¹ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¥«¥ó¥Þ¶èÀÚ¤ê¤Ç½ÐÎϤ·¤Þ¤¹¡£ .sp @@ -75,11 +75,11 @@ contents .RE .PP release -.RS 3n +.RS 4 release -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é Release ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release, md5sum.txt ¤È¤¤¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºÆµ¢¸¡º÷¤·¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Õ¥¡¥¤¥ë¤´¤È¤Î MD5 ¥À¥¤¥¸¥§¥¹¥È¤È SHA1 ¥À¥¤¥¸¥§¥¹¥È¤ò´Þ¤ó¤À Release ¥Õ¥¡¥¤¥ë¤ò¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹¡£ +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é Release ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢Packages, Packages\&.gz, Packages\&.bz2, Sources, Sources\&.gz, Sources\&.bz2, Release, md5sum\&.txt ¤È¤¤¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºÆµ¢¸¡º÷¤·¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Õ¥¡¥¤¥ë¤´¤È¤Î MD5 ¥À¥¤¥¸¥§¥¹¥È¤È SHA1 ¥À¥¤¥¸¥§¥¹¥È¤ò´Þ¤ó¤À Release ¥Õ¥¡¥¤¥ë¤ò¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹¡£ .sp Release ¥Õ¥¡¥¤¥ë¤ÎÄɲå᥿¥Ç¡¼¥¿¥Õ¥£¡¼¥ë¥É¤ÎÃͤϡ¢ @@ -99,7 +99,7 @@ Description .RE .PP generate -.RS 3n +.RS 4 generate @@ -107,7 +107,7 @@ generate .RE .PP clean -.RS 3n +.RS 4 clean @@ -134,7 +134,7 @@ Dir ¥»¥¯¥·¥ç¥ó¤Ï¡¢ À¸À®¥×¥í¥»¥¹¤ÇɬÍפʥե¡¥¤¥ë¤òÇÛÃÖ¤¹¤ë¤¿¤á¤Î¡¢ ɸ½à¥Ç¥£¥ì¥¯¥È¥ê¤òÄêµÁ¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢´°Á´¤ÊÀäÂХѥ¹¤òÀ¸À®¤¹¤ë¤¿¤á¡¢ ¸å¤Î¥»¥¯¥·¥ç¥ó¤ÇÄêµÁ¤µ¤ì¤ëÁêÂХѥ¹¤ÎÁ°¤Ë·ë¹ç¤·¤Þ¤¹¡£ .PP ArchiveDir -.RS 3n +.RS 4 FTP ¥¢¡¼¥«¥¤¥Ö¤Î¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ɸ½àŪ¤Ê Debian ÀßÄê¤Ç¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï \fIls\-LR\fR @@ -142,19 +142,19 @@ FTP .RE .PP OverrideDir -.RS 3n +.RS 4 ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP CacheDir -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP FileListDir -.RS 3n +.RS 4 FileList @@ -168,19 +168,19 @@ Default ¥»¥¯¥·¥ç¥ó¤Ç¤Ï¥Ç¥Õ¥©¥ë¥ÈÃͤò»ØÄꤷ¤Þ¤¹¡£ ¤Þ¤¿¡¢À¸À®´ï¤ÎÆ°ºî¤òÀ©¸æ¤¹¤ëÀßÄê¤â¹Ô¤¤¤Þ¤¹¡£ ¾¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢¤³¤³¤Ë¤¢¤ë¥Ç¥Õ¥©¥ë¥ÈÃͤò¡¢ ¥»¥¯¥·¥ç¥ó¤´¤È¤ÎÀßÄê¤Ç¾å½ñ¤­¤·¤Þ¤¹¡£ .PP Packages::Compress -.RS 3n +.RS 4 -Package ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥Ç¥Õ¥©¥ë¥È¤Î°µ½ÌÊýË¡¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Ï '.' (°µ½Ì¤Ê¤·), 'gzip', 'bzip2' ¤¬Æþ¤ë¡¢ ¶õÇò¶èÀÚ¤ê¤Îʸ»úÎó¤Ç¤¹¡£ °µ½ÌÊýË¡¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¤¹¤Ù¤Æ '. gzip' ¤Ç¤¹¡£ +Package ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥Ç¥Õ¥©¥ë¥È¤Î°µ½ÌÊýË¡¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Ï \'\&.\' (°µ½Ì¤Ê¤·), \'gzip\', \'bzip2\' ¤¬Æþ¤ë¡¢ ¶õÇò¶èÀÚ¤ê¤Îʸ»úÎó¤Ç¤¹¡£ °µ½ÌÊýË¡¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¤¹¤Ù¤Æ \'\&. gzip\' ¤Ç¤¹¡£ .RE .PP Packages::Extensions -.RS 3n +.RS 4 -¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï '.deb' ¤Ç¤¹¡£ +¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï \'\&.deb\' ¤Ç¤¹¡£ .RE .PP Sources::Compress -.RS 3n +.RS 4 Packages::Compress @@ -188,13 +188,13 @@ Packages::Compress .RE .PP Sources::Extensions -.RS 3n +.RS 4 -¥½¡¼¥¹¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï '.dsc' ¤Ç¤¹¡£ +¥½¡¼¥¹¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï \'\&.dsc\' ¤Ç¤¹¡£ .RE .PP Contents::Compress -.RS 3n +.RS 4 Packages::Compress @@ -202,7 +202,7 @@ Packages::Compress .RE .PP DeLinkLimit -.RS 3n +.RS 4 ¼Â¹Ô¤¹¤ë¤´¤È¤Ë delink (µÚ¤Ó¥Ï¡¼¥É¥ê¥ó¥¯¤ÎÃÖ¤­´¹¤¨) ¤¹¤ëÎ̤ò¡¢ ¥­¥í¥Ð¥¤¥Èñ°Ì¤Ç»ØÄꤷ¤Þ¤¹¡£¥»¥¯¥·¥ç¥ó¤´¤È¤Î External\-Links @@ -210,7 +210,7 @@ External\-Links .RE .PP FileMode -.RS 3n +.RS 4 ºîÀ®¤·¤¿¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥â¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 0644 ¤Ç¤¹¡£Á´¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ï¡¢ umask ¤ò̵»ë¤·¤Æ¤³¤Î¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹¡£ .RE @@ -222,26 +222,27 @@ Tree ¥»¥¯¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤ì¤é¤ÎÊÑ¿ô¤Ï¤¹¤Ù¤ÆÃÖ´¹ÊÑ¿ô¤Ç¤¢¤ê¡¢ ʸ»úÎó $(DIST), $(SECTION), $(ARCH) ¤ò¤½¤ì¤¾¤ì¤ÎÃͤËŸ³«¤·¤Þ¤¹¡£ .PP MaxContentsChange -.RS 3n +.RS 4 ÆüËè¤ËÀ¸À®¤¹¤ë contents ¥Õ¥¡¥¤¥ë¤ò¥­¥í¥Ð¥¤¥Èñ°Ì¤ÇÀßÄꤷ¤Þ¤¹¡£ contents ¥Õ¥¡¥¤¥ë¤ò¥é¥¦¥ó¥É¥í¥Ó¥ó¤·¡¢¿ôÆü·Ð¤Ä¤È¤¹¤Ù¤ÆºÆÀ¸À®¤·¤Þ¤¹¡£ .RE .PP ContentsAge -.RS 3n +.RS 4 -Êѹ¹¤¬¤Ê¤¤ contents ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤¹¤ëÆü¿ô¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀ©¸Â¤ò±Û¤¨¤¿ contents ¥Õ¥¡¥¤¥ë¤Î mtime ¤ò¡¢¹¹¿·¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤â¡¢ [Î㤨¤Ð¾å½ñ¤­ÊÔ½¸¤Ç] contents ¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¡¢ ¤³¤¦¤¤¤Ã¤¿¤³¤È¤¬È¯À¸¤·¤Þ¤¹¡£ ¿·¤·¤¤ .deb ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¾ì¹ç¡¢ÊÝα¤ò²ò½ü¤Ç¤­¡¢ ¾¯¤Ê¤¯¤È¤â¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 10 ¤Ç¡¢Ã±°Ì¤ÏÆü¤Ç¤¹¡£ +Êѹ¹¤¬¤Ê¤¤ contents ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤¹¤ëÆü¿ô¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀ©¸Â¤ò±Û¤¨¤¿ contents ¥Õ¥¡¥¤¥ë¤Î mtime ¤ò¡¢¹¹¿·¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤â¡¢ [Î㤨¤Ð¾å½ñ¤­ÊÔ½¸¤Ç] contents ¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¡¢ ¤³¤¦¤¤¤Ã¤¿¤³¤È¤¬È¯À¸¤·¤Þ¤¹¡£ ¿·¤·¤¤ \&.deb ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¾ì¹ç¡¢ÊÝα¤ò²ò½ü¤Ç¤­¡¢ ¾¯¤Ê¤¯¤È¤â¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 10 ¤Ç¡¢Ã±°Ì¤ÏÆü¤Ç¤¹¡£ .RE .PP Directory -.RS 3n -.deb ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï +.RS 4 + +\&.deb ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR ¤Ç¤¹¡£ .RE .PP SrcDirectory -.RS 3n +.RS 4 ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/source/\fR @@ -249,7 +250,7 @@ SrcDirectory .RE .PP Packages -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR @@ -257,7 +258,7 @@ Packages .RE .PP Sources -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/source/Sources\fR @@ -265,7 +266,7 @@ Packages .RE .PP InternalPrefix -.RS 3n +.RS 4 ³°Éô¥ê¥ó¥¯¤Ç¤Ï¤Ê¤¯¡¢ÆâÉô¥ê¥ó¥¯¤È¸«¤Ê¤¹È½ÃǺàÎÁ¤È¤Ê¤ë¡¢ ¥Ñ¥¹¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ \fI$(DIST)/$(SECTION)/\fR @@ -273,7 +274,7 @@ InternalPrefix .RE .PP Contents -.RS 3n +.RS 4 Contents ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ \fI$(DIST)/Contents\-$(ARCH)\fR @@ -282,26 +283,26 @@ Contents .RE .PP Contents::Header -.RS 3n +.RS 4 contents ¤Î½ÐÎϤËÉÕ¤±¤ë¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP BinCacheDB -.RS 3n +.RS 4 ¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç»ÈÍѤ¹¤ë¥Ð¥¤¥Ê¥ê¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÀßÄꤷ¤Þ¤¹¡£ Ê£¿ô¤Î¥»¥¯¥·¥ç¥ó¤ÇƱ¤¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¶¦Í­¤Ç¤­¤Þ¤¹¡£ .RE .PP FileList -.RS 3n +.RS 4 ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤òÁöºº¤¹¤ëÂå¤ï¤ê¤Ë¡¢\fBapt\-ftparchive\fR ¤¬Æɤ߹þ¤à¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ÁêÂÐ¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀèƬ¤Ë¤Ä¤­¤Þ¤¹¡£ .RE .PP SourceFileList -.RS 3n +.RS 4 ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤òÁöºº¤¹¤ëÂå¤ï¤ê¤Ë¡¢\fBapt\-ftparchive\fR ¤¬Æɤ߹þ¤à¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ÁêÂÐ¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀèƬ¤Ë¤Ä¤­¤Þ¤¹¡£ ¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò½èÍý¤¹¤ëºÝ¤Ë»ÈÍѤ·¤Þ¤¹¡£ @@ -336,40 +337,40 @@ Tree ¥»¥¯¥·¥ç¥ó¤ò½èÍý¤¹¤ëºÝ¡¢ \fBapt\-ftparchive\fR ¤Ï°Ê²¼¤Î¤è¤¦¤ÊÁàºî¤ò¹Ô¤¤¤Þ¤¹¡£ -.sp .RS 3n .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE +.sp .RS 4 .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE .PP Sections -.RS 3n +.RS 4 distribution °Ê²¼¤Ë¸½¤ì¤ë¥»¥¯¥·¥ç¥ó¤ò¡¢¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Ä̾main contrib non\-free¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .RE .PP Architectures -.RS 3n +.RS 4 -search ¥»¥¯¥·¥ç¥ó°Ê²¼¤Ë¸½¤ì¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¡¢ ¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Æü쥢¡¼¥­¥Æ¥¯¥Á¥ã 'source' ¤Ï¡¢ ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥Ä¥ê¡¼¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ +search ¥»¥¯¥·¥ç¥ó°Ê²¼¤Ë¸½¤ì¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¡¢ ¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Æü쥢¡¼¥­¥Æ¥¯¥Á¥ã \'source\' ¤Ï¡¢ ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥Ä¥ê¡¼¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ .RE .PP BinOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥»¥¯¥·¥ç¥ó¡¢Í¥ÀèÅÙ¡¢ ¥á¥ó¥Æ¥Ê¤Î¥¢¥É¥ì¥¹¤È¤¤¤Ã¤¿¾ðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£ .RE .PP SrcOverride -.RS 3n +.RS 4 ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ ¥»¥¯¥·¥ç¥ó¤Î¾ðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£ .RE .PP ExtraOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥êÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcExtraOverride -.RS 3n +.RS 4 ¥½¡¼¥¹ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE @@ -385,13 +386,13 @@ SectionArchitecture ÀßÄê¤Ë»÷¤Æ¤¤¤Þ¤¹¡£ .PP Packages -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcPackages -.RS 3n +.RS 4 Sources ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â Packages @@ -401,61 +402,61 @@ SrcPackages .RE .PP Contents -.RS 3n +.RS 4 Contents ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£(¥ª¥×¥·¥ç¥ó) .RE .PP BinOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcOverride -.RS 3n +.RS 4 ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP ExtraOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥êÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcExtraOverride -.RS 3n +.RS 4 ¥½¡¼¥¹ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP BinCacheDB -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å DB ¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP PathPrefix -.RS 3n +.RS 4 Á´½ÐÎϥѥ¹¤ËÉղ乤ë¥Ñ¥¹¡£ .RE .PP FileList, SourceFileList -.RS 3n +.RS 4 ¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .SH "¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë" .PP ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ï¡¢ -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) ¤È´°Á´¤Ë¸ß´¹À­¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤³¤Ë¤Ï¡¢¶õÇò¶èÀÚ¤ê¤Ç¥Õ¥£¡¼¥ë¥É¤¬ 4 ¸Ä¤¢¤ê¤Þ¤¹¡£ ÀèƬ¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢ 2 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë¶¯À©¤¹¤ëÍ¥ÀèÅÙ¡¢ 3 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë¶¯À©¤¹¤ë¥»¥¯¥·¥ç¥ó¡¢ ºÇ¸å¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥á¥ó¥Æ¥Ê½çÎó¥Õ¥£¡¼¥ë¥É¤Ç¤¹¡£ .PP ¥á¥ó¥Æ¥Ê¥Õ¥£¡¼¥ë¥É¤Ï°ìÈÌŪ¤Ë¤Ï¡¢ .sp -.RS 3n +.RS 4 .nf old [// oldn]* => new .fi @@ -463,7 +464,7 @@ old [// oldn]* => new .sp ¤È¤¤¤¦·Á¼°¤«¡¢Ã±½ã¤Ë .sp -.RS 3n +.RS 4 .nf new .fi @@ -474,7 +475,7 @@ new .PP ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ï¡¢ -\fBdpkg\-scansources\fR(8) +\fBdpkg-scansources\fR(8) ¤È´°Á´¤Ë¸ß´¹À­¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤³¤Ë¤Ï¡¢¶õÇò¶èÀÚ¤ê¤Ç¥Õ¥£¡¼¥ë¥É¤¬ 2 ¸Ä¤¢¤ê¤Þ¤¹¡£ ÀèƬ¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢ 2 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï³ä¤êÅö¤Æ¤ë¥»¥¯¥·¥ç¥ó¤Ç¤¹¡£ .SH "ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë" .PP @@ -488,21 +489,21 @@ new ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-\-md5\fR -.RS 3n +.RS 4 MD5 sum ¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç on ¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢ off ¤Ë¤¹¤ë¤ÈÀ¸À®¤·¤¿¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ë MD5Sum ¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::MD5 .RE .PP \fB\-d\fR, \fB\-\-db\fR -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥­¥ã¥Ã¥·¥å DB ¤ò»ÈÍѤ·¤Þ¤¹¡£ generate ¥³¥Þ¥ó¥É¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::DB .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -510,7 +511,7 @@ quiet .RE .PP \fB\-\-delink\fR -.RS 3n +.RS 4 Delink ¤ò¼Â¹Ô¤·¤Þ¤¹¡£ External\-Links @@ -521,14 +522,14 @@ APT::FTPArchive::DeLinkAct .RE .PP \fB\-\-contents\fR -.RS 3n +.RS 4 contents ¤ÎÀ¸À®¤ò¹Ô¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¥­¥ã¥Ã¥·¥å DB ¤È¶¦¤ËÀ¸À®¤¹¤ëºÝ¡¢ ¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¸å¤Ç»ÈÍѤ¹¤ë¤è¤¦¤Ë¡¢Ãê½Ð¤· DB ¤Ë³ÊǼ¤·¤Þ¤¹¡£ generate ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ëºÝ¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¤¤º¤ì¤Î Contents ¥Õ¥¡¥¤¥ë¤âºîÀ®¤Ç¤­¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï on ¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::Contents .RE .PP \fB\-s\fR, \fB\-\-source\-override\fR -.RS 3n +.RS 4 sources @@ -537,42 +538,42 @@ APT::FTPArchive::SourceOverride .RE .PP \fB\-\-readonly\fR -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߼è¤êÀìÍѤˤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::ReadOnlyDB .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥µ¥ó¥×¥ë" .PP -¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸ (.deb) ¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î Packages ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£ +¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸ (\&.deb) ¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î Packages ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -\fBapt\-ftparchive\fR packages \fIdirectory\fR | \fBgzip\fR > \fIPackages.gz\fR +\fBapt\-ftparchive\fR packages \fIdirectory\fR | \fBgzip\fR > \fIPackages\&.gz\fR .fi .RE .SH "´ØÏ¢¹àÌÜ" @@ -584,29 +585,31 @@ APT::FTPArchive::ReadOnlyDB ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-ftparchive.ja.1 b/doc/ja/apt-ftparchive.ja.1 index 6501838..5e1a6df 100644 --- a/doc/ja/apt-ftparchive.ja.1 +++ b/doc/ja/apt-ftparchive.ja.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-ftparchive +.\" Title: apt-ftparchive .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-ftparchive \- ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÀ¸À®¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-ftparchive \- ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÀ¸À®¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 15 \fBapt\-ftparchive\fR [\fB\-hvdsq\fR] [\fB\-\-md5\fR] [\fB\-\-delink\fR] [\fB\-\-readonly\fR] [\fB\-\-contents\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[packages\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [sources\ \fIpath\fR...\ [\fIoverride\fR\ [\fIpathprefix\fR]]] | [contents\ \fIpath\fR] | [release\ \fIpath\fR] | [generate\ \fIconfig\-file\fR\ \fIsection\fR...] | [clean\ \fIconfig\-file\fR]} @@ -22,7 +22,7 @@ apt\-ftparchive \- .PP \fBapt\-ftparchive\fR ¤Ï¡¢ -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) ¥×¥í¥°¥é¥à¤Î¥¹¡¼¥Ñ¡¼¥»¥Ã¥È¤Ç¡¢ packages ¥³¥Þ¥ó¥É·Ðͳ¤Çµ¡Ç½Á´ÂΤò¼è¤ê¹þ¤ó¤Ç¤¤¤Þ¤¹¡£ ¤Þ¤¿¡¢contents ¥Õ¥¡¥¤¥ë¥¸¥§¥Í¥ì¡¼¥¿ @@ -31,7 +31,7 @@ contents .PP ËܼÁŪ¤Ë \fBapt\-ftparchive\fR -¤Ï¡¢ .deb ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¥­¥ã¥Ã¥·¥å¤¹¤ë¤Î¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fBgzip\fR(1) +¤Ï¡¢ \&.deb ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤò¥­¥ã¥Ã¥·¥å¤¹¤ë¤Î¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fBgzip\fR(1) °Ê³°¤Î¤¤¤«¤Ê¤ë³°Éô¥×¥í¥°¥é¥à¤Ë¤â°Í¸¤·¤Þ¤»¤ó¡£ ¤¹¤Ù¤ÆÀ¸À®¤¹¤ëºÝ¤Ë¤Ï¡¢ ¥Õ¥¡¥¤¥ëÊѹ¹ÅÀ¤Î¸¡½Ð¤È´õ˾¤·¤¿°µ½Ì½ÐÎÏ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤ò¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Þ¤¹¡£ .PP \fB\-h\fR @@ -40,9 +40,9 @@ contents ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP packages -.RS 3n +.RS 4 -packages ¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg\-scanpackages\fR(8) +packages ¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg-scanpackages\fR(8) ¤È¤Û¤ÜƱ¤¸¤Ç¤¹¡£ .sp \fB\-\-db\fR @@ -50,11 +50,11 @@ packages .RE .PP sources -.RS 3n +.RS 4 sources -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.dsc ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥½¡¼¥¹¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg\-scansources\fR(8) +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.dsc ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥½¡¼¥¹¥ì¥³¡¼¥É¤òɸ½à½ÐÎϤˤ½¤ì¤¾¤ì½ÐÎϤ·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢\fBdpkg-scansources\fR(8) ¤È¤Û¤ÜƱ¤¸¤Ç¤¹¡£ .sp @@ -62,11 +62,11 @@ override .RE .PP contents -.RS 3n +.RS 4 contents -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥³¥ó¥Æ¥ó¥Ä¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Õ¥¡¥¤¥ë¤´¤È¤Ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òÆɤ߼è¤ê¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Ñ¥Ã¥±¡¼¥¸¤ËÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òɸ½à½ÐÎϤ˥½¡¼¥È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡£ ¥Ç¥£¥ì¥¯¥È¥ê¤Ï½ÐÎϤ˴ޤޤì¤Þ¤»¤ó¡£ Ê£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¾ì¹ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¥«¥ó¥Þ¶èÀÚ¤ê¤Ç½ÐÎϤ·¤Þ¤¹¡£ +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é¥³¥ó¥Æ¥ó¥Ä¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÆµ¢¸¡º÷¤·¡¢\&.deb ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£ ¤Þ¤¿¥Õ¥¡¥¤¥ë¤´¤È¤Ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òÆɤ߼è¤ê¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Ñ¥Ã¥±¡¼¥¸¤ËÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë°ìÍ÷¤òɸ½à½ÐÎϤ˥½¡¼¥È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡£ ¥Ç¥£¥ì¥¯¥È¥ê¤Ï½ÐÎϤ˴ޤޤì¤Þ¤»¤ó¡£ Ê£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¾ì¹ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò¥«¥ó¥Þ¶èÀÚ¤ê¤Ç½ÐÎϤ·¤Þ¤¹¡£ .sp @@ -75,11 +75,11 @@ contents .RE .PP release -.RS 3n +.RS 4 release -¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é Release ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release, md5sum.txt ¤È¤¤¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºÆµ¢¸¡º÷¤·¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Õ¥¡¥¤¥ë¤´¤È¤Î MD5 ¥À¥¤¥¸¥§¥¹¥È¤È SHA1 ¥À¥¤¥¸¥§¥¹¥È¤ò´Þ¤ó¤À Release ¥Õ¥¡¥¤¥ë¤ò¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹¡£ +¥³¥Þ¥ó¥É¤Ï¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤«¤é Release ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£ Í¿¤¨¤é¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢Packages, Packages\&.gz, Packages\&.bz2, Sources, Sources\&.gz, Sources\&.bz2, Release, md5sum\&.txt ¤È¤¤¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºÆµ¢¸¡º÷¤·¤Þ¤¹¡£ ¤½¤Î¸å¡¢¥Õ¥¡¥¤¥ë¤´¤È¤Î MD5 ¥À¥¤¥¸¥§¥¹¥È¤È SHA1 ¥À¥¤¥¸¥§¥¹¥È¤ò´Þ¤ó¤À Release ¥Õ¥¡¥¤¥ë¤ò¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹¡£ .sp Release ¥Õ¥¡¥¤¥ë¤ÎÄɲå᥿¥Ç¡¼¥¿¥Õ¥£¡¼¥ë¥É¤ÎÃͤϡ¢ @@ -99,7 +99,7 @@ Description .RE .PP generate -.RS 3n +.RS 4 generate @@ -107,7 +107,7 @@ generate .RE .PP clean -.RS 3n +.RS 4 clean @@ -134,7 +134,7 @@ Dir ¥»¥¯¥·¥ç¥ó¤Ï¡¢ À¸À®¥×¥í¥»¥¹¤ÇɬÍפʥե¡¥¤¥ë¤òÇÛÃÖ¤¹¤ë¤¿¤á¤Î¡¢ ɸ½à¥Ç¥£¥ì¥¯¥È¥ê¤òÄêµÁ¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢´°Á´¤ÊÀäÂХѥ¹¤òÀ¸À®¤¹¤ë¤¿¤á¡¢ ¸å¤Î¥»¥¯¥·¥ç¥ó¤ÇÄêµÁ¤µ¤ì¤ëÁêÂХѥ¹¤ÎÁ°¤Ë·ë¹ç¤·¤Þ¤¹¡£ .PP ArchiveDir -.RS 3n +.RS 4 FTP ¥¢¡¼¥«¥¤¥Ö¤Î¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ɸ½àŪ¤Ê Debian ÀßÄê¤Ç¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï \fIls\-LR\fR @@ -142,19 +142,19 @@ FTP .RE .PP OverrideDir -.RS 3n +.RS 4 ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP CacheDir -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP FileListDir -.RS 3n +.RS 4 FileList @@ -168,19 +168,19 @@ Default ¥»¥¯¥·¥ç¥ó¤Ç¤Ï¥Ç¥Õ¥©¥ë¥ÈÃͤò»ØÄꤷ¤Þ¤¹¡£ ¤Þ¤¿¡¢À¸À®´ï¤ÎÆ°ºî¤òÀ©¸æ¤¹¤ëÀßÄê¤â¹Ô¤¤¤Þ¤¹¡£ ¾¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢¤³¤³¤Ë¤¢¤ë¥Ç¥Õ¥©¥ë¥ÈÃͤò¡¢ ¥»¥¯¥·¥ç¥ó¤´¤È¤ÎÀßÄê¤Ç¾å½ñ¤­¤·¤Þ¤¹¡£ .PP Packages::Compress -.RS 3n +.RS 4 -Package ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥Ç¥Õ¥©¥ë¥È¤Î°µ½ÌÊýË¡¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Ï '.' (°µ½Ì¤Ê¤·), 'gzip', 'bzip2' ¤¬Æþ¤ë¡¢ ¶õÇò¶èÀÚ¤ê¤Îʸ»úÎó¤Ç¤¹¡£ °µ½ÌÊýË¡¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¤¹¤Ù¤Æ '. gzip' ¤Ç¤¹¡£ +Package ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥Ç¥Õ¥©¥ë¥È¤Î°µ½ÌÊýË¡¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Ï \'\&.\' (°µ½Ì¤Ê¤·), \'gzip\', \'bzip2\' ¤¬Æþ¤ë¡¢ ¶õÇò¶èÀÚ¤ê¤Îʸ»úÎó¤Ç¤¹¡£ °µ½ÌÊýË¡¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¤¹¤Ù¤Æ \'\&. gzip\' ¤Ç¤¹¡£ .RE .PP Packages::Extensions -.RS 3n +.RS 4 -¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï '.deb' ¤Ç¤¹¡£ +¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï \'\&.deb\' ¤Ç¤¹¡£ .RE .PP Sources::Compress -.RS 3n +.RS 4 Packages::Compress @@ -188,13 +188,13 @@ Packages::Compress .RE .PP Sources::Extensions -.RS 3n +.RS 4 -¥½¡¼¥¹¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï '.dsc' ¤Ç¤¹¡£ +¥½¡¼¥¹¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÎóµó¤·¤Þ¤¹¡£ ¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï \'\&.dsc\' ¤Ç¤¹¡£ .RE .PP Contents::Compress -.RS 3n +.RS 4 Packages::Compress @@ -202,7 +202,7 @@ Packages::Compress .RE .PP DeLinkLimit -.RS 3n +.RS 4 ¼Â¹Ô¤¹¤ë¤´¤È¤Ë delink (µÚ¤Ó¥Ï¡¼¥É¥ê¥ó¥¯¤ÎÃÖ¤­´¹¤¨) ¤¹¤ëÎ̤ò¡¢ ¥­¥í¥Ð¥¤¥Èñ°Ì¤Ç»ØÄꤷ¤Þ¤¹¡£¥»¥¯¥·¥ç¥ó¤´¤È¤Î External\-Links @@ -210,7 +210,7 @@ External\-Links .RE .PP FileMode -.RS 3n +.RS 4 ºîÀ®¤·¤¿¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥â¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 0644 ¤Ç¤¹¡£Á´¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ï¡¢ umask ¤ò̵»ë¤·¤Æ¤³¤Î¥â¡¼¥É¤ò»ÈÍѤ·¤Þ¤¹¡£ .RE @@ -222,26 +222,27 @@ Tree ¥»¥¯¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤ì¤é¤ÎÊÑ¿ô¤Ï¤¹¤Ù¤ÆÃÖ´¹ÊÑ¿ô¤Ç¤¢¤ê¡¢ ʸ»úÎó $(DIST), $(SECTION), $(ARCH) ¤ò¤½¤ì¤¾¤ì¤ÎÃͤËŸ³«¤·¤Þ¤¹¡£ .PP MaxContentsChange -.RS 3n +.RS 4 ÆüËè¤ËÀ¸À®¤¹¤ë contents ¥Õ¥¡¥¤¥ë¤ò¥­¥í¥Ð¥¤¥Èñ°Ì¤ÇÀßÄꤷ¤Þ¤¹¡£ contents ¥Õ¥¡¥¤¥ë¤ò¥é¥¦¥ó¥É¥í¥Ó¥ó¤·¡¢¿ôÆü·Ð¤Ä¤È¤¹¤Ù¤ÆºÆÀ¸À®¤·¤Þ¤¹¡£ .RE .PP ContentsAge -.RS 3n +.RS 4 -Êѹ¹¤¬¤Ê¤¤ contents ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤¹¤ëÆü¿ô¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀ©¸Â¤ò±Û¤¨¤¿ contents ¥Õ¥¡¥¤¥ë¤Î mtime ¤ò¡¢¹¹¿·¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤â¡¢ [Î㤨¤Ð¾å½ñ¤­ÊÔ½¸¤Ç] contents ¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¡¢ ¤³¤¦¤¤¤Ã¤¿¤³¤È¤¬È¯À¸¤·¤Þ¤¹¡£ ¿·¤·¤¤ .deb ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¾ì¹ç¡¢ÊÝα¤ò²ò½ü¤Ç¤­¡¢ ¾¯¤Ê¤¯¤È¤â¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 10 ¤Ç¡¢Ã±°Ì¤ÏÆü¤Ç¤¹¡£ +Êѹ¹¤¬¤Ê¤¤ contents ¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤¹¤ëÆü¿ô¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀ©¸Â¤ò±Û¤¨¤¿ contents ¥Õ¥¡¥¤¥ë¤Î mtime ¤ò¡¢¹¹¿·¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤â¡¢ [Î㤨¤Ð¾å½ñ¤­ÊÔ½¸¤Ç] contents ¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¡¢ ¤³¤¦¤¤¤Ã¤¿¤³¤È¤¬È¯À¸¤·¤Þ¤¹¡£ ¿·¤·¤¤ \&.deb ¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¾ì¹ç¡¢ÊÝα¤ò²ò½ü¤Ç¤­¡¢ ¾¯¤Ê¤¯¤È¤â¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï 10 ¤Ç¡¢Ã±°Ì¤ÏÆü¤Ç¤¹¡£ .RE .PP Directory -.RS 3n -.deb ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï +.RS 4 + +\&.deb ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/binary\-$(ARCH)/\fR ¤Ç¤¹¡£ .RE .PP SrcDirectory -.RS 3n +.RS 4 ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÀèƬ¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/source/\fR @@ -249,7 +250,7 @@ SrcDirectory .RE .PP Packages -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/binary\-$(ARCH)/Packages\fR @@ -257,7 +258,7 @@ Packages .RE .PP Sources -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï \fI$(DIST)/$(SECTION)/source/Sources\fR @@ -265,7 +266,7 @@ Packages .RE .PP InternalPrefix -.RS 3n +.RS 4 ³°Éô¥ê¥ó¥¯¤Ç¤Ï¤Ê¤¯¡¢ÆâÉô¥ê¥ó¥¯¤È¸«¤Ê¤¹È½ÃǺàÎÁ¤È¤Ê¤ë¡¢ ¥Ñ¥¹¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ \fI$(DIST)/$(SECTION)/\fR @@ -273,7 +274,7 @@ InternalPrefix .RE .PP Contents -.RS 3n +.RS 4 Contents ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ \fI$(DIST)/Contents\-$(ARCH)\fR @@ -282,26 +283,26 @@ Contents .RE .PP Contents::Header -.RS 3n +.RS 4 contents ¤Î½ÐÎϤËÉÕ¤±¤ë¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP BinCacheDB -.RS 3n +.RS 4 ¤³¤Î¥»¥¯¥·¥ç¥ó¤Ç»ÈÍѤ¹¤ë¥Ð¥¤¥Ê¥ê¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÀßÄꤷ¤Þ¤¹¡£ Ê£¿ô¤Î¥»¥¯¥·¥ç¥ó¤ÇƱ¤¸¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¶¦Í­¤Ç¤­¤Þ¤¹¡£ .RE .PP FileList -.RS 3n +.RS 4 ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤òÁöºº¤¹¤ëÂå¤ï¤ê¤Ë¡¢\fBapt\-ftparchive\fR ¤¬Æɤ߹þ¤à¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ÁêÂÐ¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀèƬ¤Ë¤Ä¤­¤Þ¤¹¡£ .RE .PP SourceFileList -.RS 3n +.RS 4 ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤òÁöºº¤¹¤ëÂå¤ï¤ê¤Ë¡¢\fBapt\-ftparchive\fR ¤¬Æɤ߹þ¤à¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ÁêÂÐ¥Õ¥¡¥¤¥ë̾¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬ÀèƬ¤Ë¤Ä¤­¤Þ¤¹¡£ ¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò½èÍý¤¹¤ëºÝ¤Ë»ÈÍѤ·¤Þ¤¹¡£ @@ -336,40 +337,40 @@ Tree ¥»¥¯¥·¥ç¥ó¤ò½èÍý¤¹¤ëºÝ¡¢ \fBapt\-ftparchive\fR ¤Ï°Ê²¼¤Î¤è¤¦¤ÊÁàºî¤ò¹Ô¤¤¤Þ¤¹¡£ -.sp .RS 3n .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE +.sp .RS 4 .nf for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j .fi .RE .PP Sections -.RS 3n +.RS 4 distribution °Ê²¼¤Ë¸½¤ì¤ë¥»¥¯¥·¥ç¥ó¤ò¡¢¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Ä̾main contrib non\-free¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .RE .PP Architectures -.RS 3n +.RS 4 -search ¥»¥¯¥·¥ç¥ó°Ê²¼¤Ë¸½¤ì¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¡¢ ¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Æü쥢¡¼¥­¥Æ¥¯¥Á¥ã 'source' ¤Ï¡¢ ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥Ä¥ê¡¼¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ +search ¥»¥¯¥·¥ç¥ó°Ê²¼¤Ë¸½¤ì¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¡¢ ¶õÇò¶èÀÚ¤ê¤Ç»ØÄꤷ¤¿¥ê¥¹¥È¤Ç¤¹¡£ Æü쥢¡¼¥­¥Æ¥¯¥Á¥ã \'source\' ¤Ï¡¢ ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥Ä¥ê¡¼¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ .RE .PP BinOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥»¥¯¥·¥ç¥ó¡¢Í¥ÀèÅÙ¡¢ ¥á¥ó¥Æ¥Ê¤Î¥¢¥É¥ì¥¹¤È¤¤¤Ã¤¿¾ðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£ .RE .PP SrcOverride -.RS 3n +.RS 4 ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ ¥»¥¯¥·¥ç¥ó¤Î¾ðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£ .RE .PP ExtraOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥êÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcExtraOverride -.RS 3n +.RS 4 ¥½¡¼¥¹ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE @@ -385,13 +386,13 @@ SectionArchitecture ÀßÄê¤Ë»÷¤Æ¤¤¤Þ¤¹¡£ .PP Packages -.RS 3n +.RS 4 Packages ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcPackages -.RS 3n +.RS 4 Sources ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£ ¾¯¤Ê¤¯¤È¤â Packages @@ -401,61 +402,61 @@ SrcPackages .RE .PP Contents -.RS 3n +.RS 4 Contents ¥Õ¥¡¥¤¥ë¤Î½ÐÎÏÀè¤òÀßÄꤷ¤Þ¤¹¡£(¥ª¥×¥·¥ç¥ó) .RE .PP BinOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcOverride -.RS 3n +.RS 4 ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP ExtraOverride -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥êÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP SrcExtraOverride -.RS 3n +.RS 4 ¥½¡¼¥¹ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP BinCacheDB -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å DB ¤òÀßÄꤷ¤Þ¤¹¡£ .RE .PP PathPrefix -.RS 3n +.RS 4 Á´½ÐÎϥѥ¹¤ËÉղ乤ë¥Ñ¥¹¡£ .RE .PP FileList, SourceFileList -.RS 3n +.RS 4 ¥Õ¥¡¥¤¥ë°ìÍ÷¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .SH "¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë" .PP ¥Ð¥¤¥Ê¥ê¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ï¡¢ -\fBdpkg\-scanpackages\fR(8) +\fBdpkg-scanpackages\fR(8) ¤È´°Á´¤Ë¸ß´¹À­¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤³¤Ë¤Ï¡¢¶õÇò¶èÀÚ¤ê¤Ç¥Õ¥£¡¼¥ë¥É¤¬ 4 ¸Ä¤¢¤ê¤Þ¤¹¡£ ÀèƬ¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢ 2 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë¶¯À©¤¹¤ëÍ¥ÀèÅÙ¡¢ 3 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë¶¯À©¤¹¤ë¥»¥¯¥·¥ç¥ó¡¢ ºÇ¸å¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥á¥ó¥Æ¥Ê½çÎó¥Õ¥£¡¼¥ë¥É¤Ç¤¹¡£ .PP ¥á¥ó¥Æ¥Ê¥Õ¥£¡¼¥ë¥É¤Ï°ìÈÌŪ¤Ë¤Ï¡¢ .sp -.RS 3n +.RS 4 .nf old [// oldn]* => new .fi @@ -463,7 +464,7 @@ old [// oldn]* => new .sp ¤È¤¤¤¦·Á¼°¤«¡¢Ã±½ã¤Ë .sp -.RS 3n +.RS 4 .nf new .fi @@ -474,7 +475,7 @@ new .PP ¥½¡¼¥¹¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë¤Ï¡¢ -\fBdpkg\-scansources\fR(8) +\fBdpkg-scansources\fR(8) ¤È´°Á´¤Ë¸ß´¹À­¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤³¤Ë¤Ï¡¢¶õÇò¶èÀÚ¤ê¤Ç¥Õ¥£¡¼¥ë¥É¤¬ 2 ¸Ä¤¢¤ê¤Þ¤¹¡£ ÀèƬ¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸Ì¾¡¢ 2 ÈÖÌܤΥե£¡¼¥ë¥É¤Ï³ä¤êÅö¤Æ¤ë¥»¥¯¥·¥ç¥ó¤Ç¤¹¡£ .SH "ÆÃÊÌ¥ª¡¼¥Ð¡¼¥é¥¤¥É¥Õ¥¡¥¤¥ë" .PP @@ -488,21 +489,21 @@ new ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-\-md5\fR -.RS 3n +.RS 4 MD5 sum ¤òÀ¸À®¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç on ¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢ off ¤Ë¤¹¤ë¤ÈÀ¸À®¤·¤¿¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ë MD5Sum ¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::MD5 .RE .PP \fB\-d\fR, \fB\-\-db\fR -.RS 3n +.RS 4 ¥Ð¥¤¥Ê¥ê¥­¥ã¥Ã¥·¥å DB ¤ò»ÈÍѤ·¤Þ¤¹¡£ generate ¥³¥Þ¥ó¥É¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::DB .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -510,7 +511,7 @@ quiet .RE .PP \fB\-\-delink\fR -.RS 3n +.RS 4 Delink ¤ò¼Â¹Ô¤·¤Þ¤¹¡£ External\-Links @@ -521,14 +522,14 @@ APT::FTPArchive::DeLinkAct .RE .PP \fB\-\-contents\fR -.RS 3n +.RS 4 contents ¤ÎÀ¸À®¤ò¹Ô¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¥­¥ã¥Ã¥·¥å DB ¤È¶¦¤ËÀ¸À®¤¹¤ëºÝ¡¢ ¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¸å¤Ç»ÈÍѤ¹¤ë¤è¤¦¤Ë¡¢Ãê½Ð¤· DB ¤Ë³ÊǼ¤·¤Þ¤¹¡£ generate ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ëºÝ¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¤¤º¤ì¤Î Contents ¥Õ¥¡¥¤¥ë¤âºîÀ®¤Ç¤­¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï on ¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::Contents .RE .PP \fB\-s\fR, \fB\-\-source\-override\fR -.RS 3n +.RS 4 sources @@ -537,42 +538,42 @@ APT::FTPArchive::SourceOverride .RE .PP \fB\-\-readonly\fR -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߼è¤êÀìÍѤˤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::FTPArchive::ReadOnlyDB .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥µ¥ó¥×¥ë" .PP -¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸ (.deb) ¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î Packages ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£ +¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸ (\&.deb) ¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î Packages ¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -\fBapt\-ftparchive\fR packages \fIdirectory\fR | \fBgzip\fR > \fIPackages.gz\fR +\fBapt\-ftparchive\fR packages \fIdirectory\fR | \fBgzip\fR > \fIPackages\&.gz\fR .fi .RE .SH "´ØÏ¢¹àÌÜ" @@ -584,29 +585,31 @@ APT::FTPArchive::ReadOnlyDB ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-get.8 b/doc/ja/apt-get.8 index db74af4..3251cd9 100644 --- a/doc/ja/apt-get.8 +++ b/doc/ja/apt-get.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-get +.\" Title: apt-get .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-get \- APT package handling utility \-\- ¥³¥Þ¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ +apt-get \- APT package handling utility -- ¥³¥Þ¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ .SH "SYNOPSIS" .HP 8 \fBapt\-get\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[update] | [upgrade] | [dselect\-upgrade] | [install\ \fIpkg\fR...] | [remove\ \fIpkg\fR...] | [source\ \fIpkg\fR...] | [build\-dep\ \fIpkg\fR...] | [check] | [clean] | [autoclean]} @@ -26,11 +26,11 @@ apt\-get \- APT package handling utility \-\- ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP update -.RS 3n +.RS 4 update¤Ï¡¢ ¼èÆÀ¸µ¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ÎºÆƱ´ü¤ò¹Ô¤¦¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï¡¢ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¤Ëµ­½Ò¤·¤¿¾ì½ê¤«¤é¼èÆÀ¤·¤Þ¤¹¡£ Î㤨¤Ð Debian ¥¢¡¼¥«¥¤¥Ö¤òÍøÍѤ¹¤ëºÝ¡¢ ¤³¤Î¥³¥Þ¥ó¥É¤¬ -\fIPackages.gz\fR +\fIPackages\&.gz\fR ¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤³¤È¤Ç¡¢ ¿·µ¬¤Þ¤¿¤Ï¹¹¿·¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤¬ÍøÍѲÄǽ¤È¤Ê¤ê¤Þ¤¹¡£ update ¤Ï¡¢upgrade @@ -40,10 +40,10 @@ dist\-upgrade .RE .PP upgrade -.RS 3n +.RS 4 upgrade ¤Ï¡¢ ¸½ºß¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤ò¡¢ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¤ËÎóµó¤·¤¿¼èÆÀ¸µ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ì¤Ð¹¹¿·¤·¤Þ¤¹¤¬¡¢ ¤¤¤«¤Ê¤ë»þ¤â¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ ÂоݤΥѥ屡¼¥¸¤¬¡¢ ¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¾õÂÖ¤òÊѹ¹¤»¤º¤Ë¹¹¿·¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢ ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¤Þ¤Þ¤È¤Ê¤ê¤Þ¤¹¡£ ºÇ½é¤Ë update ¤ò¼Â¹Ô¤·¤Æ¤ª¤­¡¢ @@ -52,7 +52,7 @@ update .RE .PP dselect\-upgrade -.RS 3n +.RS 4 dselect\-upgrade ¤Ï¡¢ ÅÁÅýŪ¤Ê Debian GNU/Linux ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥Õ¥í¥ó¥È¥¨¥ó¥É¤Î \fBdselect\fR(8) @@ -66,26 +66,26 @@ Status .RE .PP dist\-upgrade -.RS 3n +.RS 4 dist\-upgrade ¤Ï¡¢ upgrade ¤Îµ¡Ç½¤Ë²Ã¤¨¡¢ ¿·¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë°Í¸´Ø·¸¤ÎÊѹ¹¤òÃÎŪ¤ËÁàºî¤·¤Þ¤¹¡£ \fBapt\-get\fR ¤Ï¡ÖÀöÎý¤µ¤ì¤¿¡×¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ò»ý¤Á¡¢ ɬÍפȤ¢¤é¤ÐÈæ³ÓŪ½ÅÍפǤʤ¤¥Ñ¥Ã¥±¡¼¥¸¤òµ¾À·¤Ë¤·¤Æ¡¢ ºÇ½ÅÍץѥ屡¼¥¸¤Î¹¹¿·¤ò»î¤ß¤Þ¤¹¡£ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ ɬÍפʥѥ屡¼¥¸¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤Î¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¸þ¤±¤Ë¡¢°ìÈÌŪ¤ÊÀßÄê¤ò¾å½ñ¤­¤¹¤ëµ¡¹½¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \fBapt_preferences\fR(5) ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .RE .PP install -.RS 3n +.RS 4 install ¤Î¸å¤Ë¤Ï¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò 1 ¤Ä°Ê¾å»ØÄꤷ¤Þ¤¹¡£ »ØÄꤹ¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¤Ê¤¯¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£ (Î㤨¤Ð Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ -libc6_1.9.6\-2.deb +libc6_1\&.9\&.6\-2\&.deb ¤Ç¤Ï¤Ê¤¯ libc6 ¤ò°ú¿ô¤È¤·¤ÆÍ¿¤¨¤Þ¤¹) ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦»ØÄꤷ¤¿¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢ ¸¡º÷¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¥Õ¥¡¥¤¥ë¤ò¡¢ Í׵᤹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¾ì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤í¤Ë (¶õÇò¤ò´Þ¤Þ¤º) ¥Ï¥¤¥Õ¥ó¤¬Äɲ䵤ì¤Æ¤¤¤ë¾ì¹ç¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ì¤Ðºï½ü¤·¤Þ¤¹¡£ ƱÍͤˡ¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨¤¹¤ë¤Î¤Ë¥×¥é¥¹µ­¹æ¤â»ÈÍѤǤ­¤Þ¤¹¡£ ¤³¤Îµ­¹æ¤Ï apt\-get ¤Î¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ÎȽÃǤËÍøÍѤµ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ .sp ¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¤¥³¡¼¥ëµ­¹æ¤È¥Ð¡¼¥¸¥ç¥ó¤ò³¤±¤ë¤³¤È¤Ç¡¢ ÁªÂò¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢»ØÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤ËÁªÂò¤¹¤ë¡¢ ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ Ê̤ÎÊýË¡¤È¤·¤Æ¤Ï¡¢¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÆÃÄꤹ¤ë¤Î¤Ë¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë³¤±¤Æ¡¢ ¥¹¥é¥Ã¥·¥å¤È¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤ä¥¢¡¼¥«¥¤¥Ö̾ (stable, testing, unstable) ¤òµ­½Ò¤Ç¤­¤Þ¤¹¡£ @@ -95,18 +95,18 @@ libc6_1.9.6\-2.deb ºÇ¸å¤Ë¡¢\fBapt_preferences\fR(5) µ¡¹½¤Ë¤è¤ê¡¢ ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë¥¤¥ó¥¹¥È¡¼¥ë¥Ý¥ê¥·¡¼¤òºîÀ®¤Ç¤­¤Þ¤¹¡£ .sp -¹½Ê¸¤Ë '.', '?', '*' ¤ò´Þ¤ß¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¥Þ¥Ã¥Á¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ POSIX Àµµ¬É½¸½¤Ç¤¢¤ë¤È¸«¤Ê¤·¡¢ ¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÁ´¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤ÆŬÍѤ·¤Þ¤¹¡£ ¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤¹¤Ù¤Æ¤¬¥¤¥ó¥¹¥È¡¼¥ë(¤â¤·¤¯¤Ïºï½ü)¤µ¤ì¤Þ¤¹¡£ 'lo.*' ¤Î¤è¤¦¤Êʸ»úÎó¤Ï¡¢ 'how\-lo' ¤ä 'lowest' ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤¦¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢'^' ¤ä '$' ¤òÉÕ¤±¤ë¤«¡¢ ¤â¤Ã¤È¾Ü¤·¤¤Àµµ¬É½¸½¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ +¹½Ê¸¤Ë \'\&.\', \'?\', \'*\' ¤ò´Þ¤ß¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¥Þ¥Ã¥Á¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ POSIX Àµµ¬É½¸½¤Ç¤¢¤ë¤È¸«¤Ê¤·¡¢ ¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÁ´¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤ÆŬÍѤ·¤Þ¤¹¡£ ¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤¹¤Ù¤Æ¤¬¥¤¥ó¥¹¥È¡¼¥ë(¤â¤·¤¯¤Ïºï½ü)¤µ¤ì¤Þ¤¹¡£ \'lo\&.*\' ¤Î¤è¤¦¤Êʸ»úÎó¤Ï¡¢ \'how\-lo\' ¤ä \'lowest\' ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤¦¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\'^\' ¤ä \'$\' ¤òÉÕ¤±¤ë¤«¡¢ ¤â¤Ã¤È¾Ü¤·¤¤Àµµ¬É½¸½¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP remove -.RS 3n +.RS 4 remove ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¤³¤È¤ò½ü¤­¡¢install ¤ÈƱÍͤǤ¹¡£ ¥×¥é¥¹µ­¹æ¤¬¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë (´Ö¤Ë¶õÇò¤ò´Þ¤Þ¤º¤Ë) Éղ䵤ì¤ë¤È¡¢ ¼±Ê̤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ºï½ü¤Ç¤Ï¤Ê¤¯¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP source -.RS 3n +.RS 4 source ¤Ï¡¢ ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤Î¤Ë \fBapt\-get\fR @@ -114,7 +114,7 @@ source \fBsources.list\fR(5) ¥Õ¥¡¥¤¥ë¤Î deb\-src -¹Ô¤«¤é¡¢¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÄÉÀפ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ (¤Þ¤¿¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë) ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢ ¼èÆÀ¸µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£ \-\-compile ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢dpkg\-buildpackage ¤òÍѤ¤¤Æ ¥Ð¥¤¥Ê¥ê .deb ¥Õ¥¡¥¤¥ë¤Ø¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ \-\-download\-only ¤Î¾ì¹ç¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òŸ³«¤·¤Þ¤»¤ó¡£ +¹Ô¤«¤é¡¢¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÄÉÀפ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ (¤Þ¤¿¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë) ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢ ¼èÆÀ¸µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£ \-\-compile ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢dpkg\-buildpackage ¤òÍѤ¤¤Æ ¥Ð¥¤¥Ê¥ê \&.deb ¥Õ¥¡¥¤¥ë¤Ø¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ \-\-download\-only ¤Î¾ì¹ç¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òŸ³«¤·¤Þ¤»¤ó¡£ .sp ¥Ñ¥Ã¥±¡¼¥¸¤ÈƱÍͤˡ¢ ¥½¡¼¥¹Ì¾¤Î¸å¤í¤Ë¥¤¥³¡¼¥ë¤È¼èÆÀ¤·¤¿¤¤¥Ð¡¼¥¸¥ç¥ó¤òÃÖ¤¯¤È¡¢ »ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£ APT::Get::Only\-Source @@ -124,19 +124,19 @@ tar ball .RE .PP build\-dep -.RS 3n +.RS 4 build\-dep ¤Ï¡¢ ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Î¹½Ã۰͸´Ø·¸¤òËþ¤¿¤¹¤è¤¦¤Ë¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦ºï½ü¤ò¹Ô¤¤¤Þ¤¹¡£ .RE .PP check -.RS 3n +.RS 4 check ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Î¹¹¿·¤ä²õ¤ì¤¿°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤¹¤ë¿ÇÃǥġ¼¥ë¤Ç¤¹¡£ .RE .PP clean -.RS 3n +.RS 4 clean ¤Ï¡¢ ¼èÆÀ¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥í¡¼¥«¥ë¥ê¥Ý¥¸¥È¥ê¤òÁݽü¤·¤Þ¤¹¡£ \fI/var/cache/apt/archives/\fR @@ -152,7 +152,7 @@ apt\-get clean .RE .PP autoclean -.RS 3n +.RS 4 clean ¤ÈƱÍͤˡ¢ autoclean @@ -168,13 +168,13 @@ APT::Clean\-Installed ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-d\fR, \fB\-\-download\-only\fR -.RS 3n +.RS 4 ¥À¥¦¥ó¥í¡¼¥É¤Î¤ß \- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Î¤ß¤ò¹Ô¤¤¡¢ Ÿ³«¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::Get::Download\-Only .RE .PP \fB\-f\fR, \fB\-\-fix\-broken\fR -.RS 3n +.RS 4 ½¤Éü \- °Í¸´Ø·¸¤¬²õ¤ì¤¿¥·¥¹¥Æ¥à¤Î½¤Àµ¤ò»î¤ß¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò install ¤ä remove ¤È°ì½ï¤Ë»È¤¦¤È¤­¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤â¡¢´°Á´¤ËÌäÂê¤ò²ò·è¤·¤Þ¤¹¡£APT ¼«ÂΤϡ¢ ¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸°Í¸´Ø·¸¤òµö¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢ ½é¤á¤Æ APT ¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬Íפˤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£ ¥·¥¹¥Æ¥à¤Î°Í¸´Ø·¸¹½Â¤¤Ë¤«¤Ê¤êÌäÂ꤬¤¢¤ë¾ì¹ç¤Ï¡¢ ¼êÆ°¤Ç½¤Àµ¤¹¤ë¤è¤¦Í׵᤹¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£ (Ä̾ï¤Ï¡¢ÌäÂê¤Î¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¼è¤ê½ü¤¯¤Î¤Ë \fBdselect\fR(8) ¤ä @@ -186,7 +186,7 @@ APT::Get::Fix\-Broken .RE .PP \fB\-m\fR, \fB\-\-ignore\-missing\fR, \fB\-\-fix\-missing\fR -.RS 3n +.RS 4 ·çÍî¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¥Ñ¥Ã¥±¡¼¥¸¤¬¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢ (¥Ñ¥Ã¥±¡¼¥¸¤ÎÇË»¤Ç) ¼èÆÀ¤·¤¿¸å¤ÎÀ°¹çÀ­¥Á¥§¥Ã¥¯¤òÄ̤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î½èÍý¤òÊÝα¤·ºÇ¸å¤Þ¤Ç½èÍý¤ò³¤±¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò \fB\-f\fR ¥ª¥×¥·¥ç¥ó¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢ ¥¨¥é¡¼¤Ë¤Ê¤ë¾õ¶·¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦ÁªÂò¤·¤Æ¤¤¤ë¾ì¹ç (Æä˥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤ÎÁàºî»þ) ¤ä¡¢ ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¡¢¤Ê¤Ë¤âɽ¼¨¤»¤ºÊÝα¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -194,15 +194,15 @@ APT::Get::Fix\-Missing .RE .PP \fB\-\-no\-download\fR -.RS 3n -¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¤¹¤Ç¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿ .deb ¤ËÂФ·¤Æ¤Î¤ß APT ¤ò¹Ô¤¦¾ì¹ç¤Ë¡¢ +.RS 4 +¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¤¹¤Ç¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿ \&.deb ¤ËÂФ·¤Æ¤Î¤ß APT ¤ò¹Ô¤¦¾ì¹ç¤Ë¡¢ \fB\-\-ignore\-missing\fR ¤ÈÊ»¤»¤Æ»È¤¦¤Î¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- APT::Get::Download .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢ ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀŽͥì¥Ù¥ë 2 ¤Ï \fB\-y\fR @@ -211,7 +211,7 @@ quiet .RE .PP \fB\-s\fR, \fB\-\-simulate\fR, \fB\-\-just\-print\fR, \fB\-\-dry\-run\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n +.RS 4 Æ°ºî¤Ê¤· \- ¤Ê¤Ë¤¬µ¯¤³¤ë¤Î¤«¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤¤¡¢ ¼ÂºÝ¤Ë¤Ï¥·¥¹¥Æ¥à¤ÎÊѹ¹¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::Get::Simulate .sp @@ -219,7 +219,7 @@ APT::Get::Simulate .RE .PP \fB\-y\fR, \fB\-\-yes\fR, \fB\-\-assume\-yes\fR -.RS 3n +.RS 4 ¥×¥í¥ó¥×¥È¤Ø¤Î¼«Æ°¾µÂú \- ¤¹¤Ù¤Æ¤Î¥×¥í¥ó¥×¥È¤Ë¼«Æ°Åª¤Ë "yes" ¤ÈÅú¤¨¡¢ÈóÂÐÏÃŪ¤Ë¼Â¹Ô¤·¤Þ¤¹¡£ ÊÝα¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾õÂÖ¤òÊѹ¹¤·¤¿¤ê¡¢ ɬ¿Ü¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤è¤¦¤ÊÉÔŬÀڤʾõ¶·¤Î¾ì¹ç¡¢ apt\-get ¤Ï½èÍý¤òÃæÃǤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -227,25 +227,25 @@ APT::Get::Assume\-Yes .RE .PP \fB\-u\fR, \fB\-\-show\-upgraded\fR -.RS 3n +.RS 4 ¹¹¿·¥Ñ¥Ã¥±¡¼¥¸É½¼¨ \- ¹¹¿·¤µ¤ì¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Show\-Upgraded .RE .PP \fB\-V\fR, \fB\-\-verbose\-versions\fR -.RS 3n +.RS 4 ¹¹¿·¡¦¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥ô¥¡¡¼¥¸¥ç¥ó¤ò¡¢ ¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Show\-Versions .RE .PP \fB\-b\fR, \fB\-\-compile\fR, \fB\-\-build\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¸å¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Compile .RE .PP \fB\-\-ignore\-hold\fR -.RS 3n +.RS 4 ÊÝα¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¥Ñ¥Ã¥±¡¼¥¸¤ÎÊÝα»Ø¼¨¤ò̵»ë¤·¤Æ \fBapt\-get\fR ¤ò¹Ô¤¤¤Þ¤¹¡£ @@ -255,7 +255,7 @@ APT::Ignore\-Hold .RE .PP \fB\-\-no\-upgrade\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¹¹¿·¤Ê¤· \- install ¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢no\-upgrade @@ -264,7 +264,7 @@ APT::Get::Upgrade .RE .PP \fB\-\-force\-yes\fR -.RS 3n +.RS 4 ¶¯À©¾µÂú \- APT ¤¬²¿¤«Â»½ý¤òÍ¿¤¨¤«¤Í¤Ê¤¤Æ°ºî¤ò¤·¤è¤¦¤È¤·¤¿¾ì¹ç¤Ç¤â¡¢ ³Îǧ¤ÎÆþÎϤʤ·¤Ç¼Â¹Ô¤·¤Æ¤·¤Þ¤¦´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤è¤Û¤É¤Î¾õ¶·¤Ç¤Ê¤±¤ì¤Ð¡¢»ÈÍѤ·¤Ê¤¤Êý¤¬¤¤¤¤¤Ç¤·¤ç¤¦¡£ force\-yes ¤Ï¡¢¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤«¤Í¤Þ¤»¤ó! ÀßÄê¹àÌÜ \- @@ -272,7 +272,7 @@ APT::Get::force\-yes .RE .PP \fB\-\-print\-uris\fR -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤¹¤ëÂå¤ï¤ê¤Ë¡¢ ¤½¤Î URI ¤òɽ¼¨¤·¤Þ¤¹¡£ URI ¤Ë¤Ï¡¢¥Ñ¥¹¡¢Âоݥե¡¥¤¥ë̾¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¡¢ ͽ¬¤µ¤ì¤ë md5 ¥Ï¥Ã¥·¥å¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ½ÐÎϤ·¤¿¥Õ¥¡¥¤¥ë̾¤¬¡¢ ¾ï¤Ë¥ê¥â¡¼¥È¥µ¥¤¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¡¢ ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤! ¤³¤ì¤Ï source ¥³¥Þ¥ó¥É¡¢ @@ -284,19 +284,19 @@ APT::Get::Print\-URIs .RE .PP \fB\-\-purge\fR -.RS 3n +.RS 4 ºï½ü¤¹¤ëºÝ¡¢¡Öºï½ü¡×¤Ç¤Ï¤Ê¤¯¡Ö´°Á´ºï½ü¡×¤ò¹Ô¤¤¤Þ¤¹¡£ ¡Ö´°Á´ºï½ü¡×¤ò¹Ô¤¦¤È»Ø¼¨¤·¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤Ë¤Ï¡¢ ¥¢¥¹¥¿¥ê¥¹¥¯ ("*") ¤¬ÉÕ¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Purge .RE .PP \fB\-\-reinstall\fR -.RS 3n +.RS 4 ¤¹¤Ç¤ËºÇ¿·ÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Æ¤â¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- -APT::Get::ReInstall. +APT::Get::ReInstall\&. .RE .PP \fB\-\-list\-cleanup\fR -.RS 3n +.RS 4 ¤³¤Îµ¡Ç½¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç ON ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ OFF ¤Ë¤¹¤ë¤Ë¤Ï \-\-no\-list\-cleanup ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£ ON ¤Î¾ì¹ç¡¢ @@ -304,13 +304,13 @@ APT::Get::ReInstall. ¤Ï¸Å¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤ò³Î¼Â¤Ë¾Ãµî¤¹¤ë¤¿¤á¡¢ ¼«Æ°Åª¤Ë \fI/var/lib/apt/lists\fR ¤ÎÃæ¿È¤ò´ÉÍý¤·¤Þ¤¹¡£ ¤³¤ì¤ò OFF ¤Ë¤¹¤ë¤Î¤Ï¡¢¼èÆÀ¸µ¥ê¥¹¥È¤òÉÑÈˤËÊѹ¹¤¹¤ë»þ¤°¤é¤¤¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- -APT::Get::List\-Cleanup. +APT::Get::List\-Cleanup\&. .RE .PP \fB\-t\fR, \fB\-\-target\-release\fR, \fB\-\-default\-release\fR -.RS 3n +.RS 4 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¥Ý¥ê¥·¡¼¥¨¥ó¥¸¥ó¤Ø¤Î¥Ç¥Õ¥©¥ë¥ÈÆþÎϤòÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢»ØÄꤵ¤ì¤¿¥ê¥ê¡¼¥¹Ê¸»úÎó¤ò»ÈÍѤ·¡¢ ¥Ç¥Õ¥©¥ë¥È pin ¤òÍ¥ÀèÅÙ 990 ¤ÇºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£ Í¥Àè¥Õ¥¡¥¤¥ë¤Ï¤³¤ÎÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£ Íפ¹¤ë¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¢ ¤É¤ÎÇÛÉۥѥ屡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«¤ò´Êñ¤Ë´ÉÍý¤·¤Þ¤¹¡£ °ìÈÌŪ¤ÊÎã¤È¤·¤Æ¤Ï¡¢ -\fB\-t '2.1*'\fR +\fB\-t \'2\&.1*\'\fR ¤ä \fB\-t unstable\fR ¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- @@ -320,7 +320,7 @@ APT::Default\-Release .RE .PP \fB\-\-trivial\-only\fR -.RS 3n +.RS 4 ¡Ö½ÅÍפǤʤ¤¡×Áàºî¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ ¤³¤ì¤ÏÏÀÍýŪ¤Ë \fB\-\-assume\-yes\fR ¤ÎÃç´Ö¤È¸«¤Ê¤»¤Þ¤¹¡£ @@ -332,13 +332,13 @@ APT::Get::Trivial\-Only .RE .PP \fB\-\-no\-remove\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¾õ¶·¤Ë¤Ê¤Ã¤¿¤È¤­¡¢ ¥×¥í¥ó¥×¥È¤òɽ¼¨¤»¤ºÃæÃǤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Remove .RE .PP \fB\-\-only\-source\fR -.RS 3n +.RS 4 source ¥³¥Þ¥ó¥É¤È build\-dep @@ -347,108 +347,108 @@ APT::Get::Only\-Source .RE .PP \fB\-\-diff\-only\fR, \fB\-\-tar\-only\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î diff ¥Õ¥¡¥¤¥ë¤ä tar ¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Diff\-Only, APT::Get::Tar\-Only .RE .PP \fB\-\-arch\-only\fR -.RS 3n +.RS 4 ¹½Ã۰͸´Ø·¸¤Î²ò·è¤ò¡¢ ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤¿¤â¤Î¤Î¤ß¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Arch\-Only .RE .PP \fB\-\-allow\-unauthenticated\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë̵»ë¤·¡¢ ¤½¤ì¤Ë¤Ä¤¤¤Æ¼ÁÌ䤷¤Þ¤»¤ó¡£ pbuilder ¤Î¤è¤¦¤Ê¥Ä¡¼¥ë¤ÇÊØÍø¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::AllowUnauthenticated .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/sources.list\fR -.RS 3n +\fI/etc/apt/sources\&.list\fR +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::SourceList .RE .PP -\fI/etc/apt/apt.conf\fR -.RS 3n +\fI/etc/apt/apt\&.conf\fR +.RS 4 APT ÀßÄê¥Õ¥¡¥¤¥ë¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Main .RE .PP -\fI/etc/apt/apt.conf.d/\fR -.RS 3n +\fI/etc/apt/apt\&.conf\&.d/\fR +.RS 4 APT ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃÇÊÒ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Parts .RE .PP \fI/etc/apt/preferences\fR -.RS 3n +.RS 4 ¥Ð¡¼¥¸¥ç¥óÍ¥Àè¥Õ¥¡¥¤¥ë¡£ ¤³¤³¤Ë "pin" ¤ÎÀßÄê¤ò¹Ô¤¤¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢ÊÌ¡¹¤Î¼èÆÀ¸µ¤ä°Û¤Ê¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¡¢ ¤É¤³¤«¤é¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«¤òÀßÄꤷ¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Preferences .RE .PP \fI/var/cache/apt/archives/\fR -.RS 3n +.RS 4 ¼èÆÀºÑ¤ß¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::Cache::Archives .RE .PP \fI/var/cache/apt/archives/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::Cache::Archives (ɬÁ³Åª¤ËÉÔ´°Á´) .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 \fBsources.list\fR(5) ¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹ÆÃÍ­¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists (ɬÁ³Åª¤ËÉÔ´°Á´) .RE .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8), -\fBapt\-cdrom\fR(8), +\fBapt-cache\fR(8), +\fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fBsources.list\fR(5), \fBapt.conf\fR(5), -\fBapt\-config\fR(8), /usr/share/doc/apt/ ¤Î APT ¥æ¡¼¥¶¡¼¥º¥¬¥¤¥É, +\fBapt-config\fR(8), /usr/share/doc/apt/ ¤Î APT ¥æ¡¼¥¶¡¼¥º¥¬¥¤¥É, \fBapt_preferences\fR(5), APT Howto .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP @@ -456,29 +456,31 @@ Dir::State::Lists ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-get.ja.8 b/doc/ja/apt-get.ja.8 index db74af4..3251cd9 100644 --- a/doc/ja/apt-get.ja.8 +++ b/doc/ja/apt-get.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-get +.\" Title: apt-get .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-get \- APT package handling utility \-\- ¥³¥Þ¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ +apt-get \- APT package handling utility -- ¥³¥Þ¥ó¥É¥é¥¤¥ó¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ .SH "SYNOPSIS" .HP 8 \fBapt\-get\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] {[update] | [upgrade] | [dselect\-upgrade] | [install\ \fIpkg\fR...] | [remove\ \fIpkg\fR...] | [source\ \fIpkg\fR...] | [build\-dep\ \fIpkg\fR...] | [check] | [clean] | [autoclean]} @@ -26,11 +26,11 @@ apt\-get \- APT package handling utility \-\- ¥ª¥×¥·¥ç¥ó¤ò½ü¤­¡¢ °Ê²¼¤Ëµó¤²¤ë¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹¡£ .PP update -.RS 3n +.RS 4 update¤Ï¡¢ ¼èÆÀ¸µ¤«¤é¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ÎºÆƱ´ü¤ò¹Ô¤¦¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ÍøÍѲÄǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï¡¢ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¤Ëµ­½Ò¤·¤¿¾ì½ê¤«¤é¼èÆÀ¤·¤Þ¤¹¡£ Î㤨¤Ð Debian ¥¢¡¼¥«¥¤¥Ö¤òÍøÍѤ¹¤ëºÝ¡¢ ¤³¤Î¥³¥Þ¥ó¥É¤¬ -\fIPackages.gz\fR +\fIPackages\&.gz\fR ¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤³¤È¤Ç¡¢ ¿·µ¬¤Þ¤¿¤Ï¹¹¿·¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾ðÊó¤¬ÍøÍѲÄǽ¤È¤Ê¤ê¤Þ¤¹¡£ update ¤Ï¡¢upgrade @@ -40,10 +40,10 @@ dist\-upgrade .RE .PP upgrade -.RS 3n +.RS 4 upgrade ¤Ï¡¢ ¸½ºß¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤ò¡¢ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¤ËÎóµó¤·¤¿¼èÆÀ¸µ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ì¤Ð¹¹¿·¤·¤Þ¤¹¤¬¡¢ ¤¤¤«¤Ê¤ë»þ¤â¸½ºß¥¤¥ó¥¹¥È¡¼¥ëÃæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü¤Ï¹Ô¤¤¤Þ¤»¤ó¡£ ÂоݤΥѥ屡¼¥¸¤¬¡¢ ¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¾õÂÖ¤òÊѹ¹¤»¤º¤Ë¹¹¿·¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢ ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¤Þ¤Þ¤È¤Ê¤ê¤Þ¤¹¡£ ºÇ½é¤Ë update ¤ò¼Â¹Ô¤·¤Æ¤ª¤­¡¢ @@ -52,7 +52,7 @@ update .RE .PP dselect\-upgrade -.RS 3n +.RS 4 dselect\-upgrade ¤Ï¡¢ ÅÁÅýŪ¤Ê Debian GNU/Linux ¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¥Õ¥í¥ó¥È¥¨¥ó¥É¤Î \fBdselect\fR(8) @@ -66,26 +66,26 @@ Status .RE .PP dist\-upgrade -.RS 3n +.RS 4 dist\-upgrade ¤Ï¡¢ upgrade ¤Îµ¡Ç½¤Ë²Ã¤¨¡¢ ¿·¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë°Í¸´Ø·¸¤ÎÊѹ¹¤òÃÎŪ¤ËÁàºî¤·¤Þ¤¹¡£ \fBapt\-get\fR ¤Ï¡ÖÀöÎý¤µ¤ì¤¿¡×¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ò»ý¤Á¡¢ ɬÍפȤ¢¤é¤ÐÈæ³ÓŪ½ÅÍפǤʤ¤¥Ñ¥Ã¥±¡¼¥¸¤òµ¾À·¤Ë¤·¤Æ¡¢ ºÇ½ÅÍץѥ屡¼¥¸¤Î¹¹¿·¤ò»î¤ß¤Þ¤¹¡£ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ ɬÍפʥѥ屡¼¥¸¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¾ì½ê¤Î¥ê¥¹¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¸þ¤±¤Ë¡¢°ìÈÌŪ¤ÊÀßÄê¤ò¾å½ñ¤­¤¹¤ëµ¡¹½¤Ë¤Ä¤¤¤Æ¤Ï¡¢ \fBapt_preferences\fR(5) ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .RE .PP install -.RS 3n +.RS 4 install ¤Î¸å¤Ë¤Ï¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò 1 ¤Ä°Ê¾å»ØÄꤷ¤Þ¤¹¡£ »ØÄꤹ¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤Ï¤Ê¤¯¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ç¤¹¡£ (Î㤨¤Ð Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ -libc6_1.9.6\-2.deb +libc6_1\&.9\&.6\-2\&.deb ¤Ç¤Ï¤Ê¤¯ libc6 ¤ò°ú¿ô¤È¤·¤ÆÍ¿¤¨¤Þ¤¹) ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦»ØÄꤷ¤¿¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢ ¸¡º÷¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ -\fI/etc/apt/sources.list\fR +\fI/etc/apt/sources\&.list\fR ¥Õ¥¡¥¤¥ë¤ò¡¢ Í׵᤹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¾ì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤ·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤í¤Ë (¶õÇò¤ò´Þ¤Þ¤º) ¥Ï¥¤¥Õ¥ó¤¬Äɲ䵤ì¤Æ¤¤¤ë¾ì¹ç¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ì¤Ðºï½ü¤·¤Þ¤¹¡£ ƱÍͤˡ¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌÀ¼¨¤¹¤ë¤Î¤Ë¥×¥é¥¹µ­¹æ¤â»ÈÍѤǤ­¤Þ¤¹¡£ ¤³¤Îµ­¹æ¤Ï apt\-get ¤Î¶¥¹ç²ò·è¥·¥¹¥Æ¥à¤ÎȽÃǤËÍøÍѤµ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ .sp ¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¤¥³¡¼¥ëµ­¹æ¤È¥Ð¡¼¥¸¥ç¥ó¤ò³¤±¤ë¤³¤È¤Ç¡¢ ÁªÂò¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢»ØÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦¤ËÁªÂò¤¹¤ë¡¢ ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£ Ê̤ÎÊýË¡¤È¤·¤Æ¤Ï¡¢¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÆÃÄꤹ¤ë¤Î¤Ë¡¢ ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë³¤±¤Æ¡¢ ¥¹¥é¥Ã¥·¥å¤È¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤ä¥¢¡¼¥«¥¤¥Ö̾ (stable, testing, unstable) ¤òµ­½Ò¤Ç¤­¤Þ¤¹¡£ @@ -95,18 +95,18 @@ libc6_1.9.6\-2.deb ºÇ¸å¤Ë¡¢\fBapt_preferences\fR(5) µ¡¹½¤Ë¤è¤ê¡¢ ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë¥¤¥ó¥¹¥È¡¼¥ë¥Ý¥ê¥·¡¼¤òºîÀ®¤Ç¤­¤Þ¤¹¡£ .sp -¹½Ê¸¤Ë '.', '?', '*' ¤ò´Þ¤ß¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¥Þ¥Ã¥Á¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ POSIX Àµµ¬É½¸½¤Ç¤¢¤ë¤È¸«¤Ê¤·¡¢ ¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÁ´¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤ÆŬÍѤ·¤Þ¤¹¡£ ¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤¹¤Ù¤Æ¤¬¥¤¥ó¥¹¥È¡¼¥ë(¤â¤·¤¯¤Ïºï½ü)¤µ¤ì¤Þ¤¹¡£ 'lo.*' ¤Î¤è¤¦¤Êʸ»úÎó¤Ï¡¢ 'how\-lo' ¤ä 'lowest' ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤¦¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢'^' ¤ä '$' ¤òÉÕ¤±¤ë¤«¡¢ ¤â¤Ã¤È¾Ü¤·¤¤Àµµ¬É½¸½¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ +¹½Ê¸¤Ë \'\&.\', \'?\', \'*\' ¤ò´Þ¤ß¡¢¥Ñ¥Ã¥±¡¼¥¸Ì¾¤¬¥Þ¥Ã¥Á¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ POSIX Àµµ¬É½¸½¤Ç¤¢¤ë¤È¸«¤Ê¤·¡¢ ¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÁ´¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ËÂФ·¤ÆŬÍѤ·¤Þ¤¹¡£ ¥Þ¥Ã¥Á¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤¹¤Ù¤Æ¤¬¥¤¥ó¥¹¥È¡¼¥ë(¤â¤·¤¯¤Ïºï½ü)¤µ¤ì¤Þ¤¹¡£ \'lo\&.*\' ¤Î¤è¤¦¤Êʸ»úÎó¤Ï¡¢ \'how\-lo\' ¤ä \'lowest\' ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤¦¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢\'^\' ¤ä \'$\' ¤òÉÕ¤±¤ë¤«¡¢ ¤â¤Ã¤È¾Ü¤·¤¤Àµµ¬É½¸½¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP remove -.RS 3n +.RS 4 remove ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¤³¤È¤ò½ü¤­¡¢install ¤ÈƱÍͤǤ¹¡£ ¥×¥é¥¹µ­¹æ¤¬¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Ë (´Ö¤Ë¶õÇò¤ò´Þ¤Þ¤º¤Ë) Éղ䵤ì¤ë¤È¡¢ ¼±Ê̤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ºï½ü¤Ç¤Ï¤Ê¤¯¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP source -.RS 3n +.RS 4 source ¤Ï¡¢ ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤Î¤Ë \fBapt\-get\fR @@ -114,7 +114,7 @@ source \fBsources.list\fR(5) ¥Õ¥¡¥¤¥ë¤Î deb\-src -¹Ô¤«¤é¡¢¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÄÉÀפ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ (¤Þ¤¿¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë) ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢ ¼èÆÀ¸µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£ \-\-compile ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢dpkg\-buildpackage ¤òÍѤ¤¤Æ ¥Ð¥¤¥Ê¥ê .deb ¥Õ¥¡¥¤¥ë¤Ø¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ \-\-download\-only ¤Î¾ì¹ç¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òŸ³«¤·¤Þ¤»¤ó¡£ +¹Ô¤«¤é¡¢¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÄÉÀפ·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ (¤Þ¤¿¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë) ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢ ¼èÆÀ¸µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£ \-\-compile ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢dpkg\-buildpackage ¤òÍѤ¤¤Æ ¥Ð¥¤¥Ê¥ê \&.deb ¥Õ¥¡¥¤¥ë¤Ø¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤¤¤Þ¤¹¡£ \-\-download\-only ¤Î¾ì¹ç¤Ï¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òŸ³«¤·¤Þ¤»¤ó¡£ .sp ¥Ñ¥Ã¥±¡¼¥¸¤ÈƱÍͤˡ¢ ¥½¡¼¥¹Ì¾¤Î¸å¤í¤Ë¥¤¥³¡¼¥ë¤È¼èÆÀ¤·¤¿¤¤¥Ð¡¼¥¸¥ç¥ó¤òÃÖ¤¯¤È¡¢ »ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤¹¡£ APT::Get::Only\-Source @@ -124,19 +124,19 @@ tar ball .RE .PP build\-dep -.RS 3n +.RS 4 build\-dep ¤Ï¡¢ ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Î¹½Ã۰͸´Ø·¸¤òËþ¤¿¤¹¤è¤¦¤Ë¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¦ºï½ü¤ò¹Ô¤¤¤Þ¤¹¡£ .RE .PP check -.RS 3n +.RS 4 check ¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥­¥ã¥Ã¥·¥å¤Î¹¹¿·¤ä²õ¤ì¤¿°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤¹¤ë¿ÇÃǥġ¼¥ë¤Ç¤¹¡£ .RE .PP clean -.RS 3n +.RS 4 clean ¤Ï¡¢ ¼èÆÀ¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¥í¡¼¥«¥ë¥ê¥Ý¥¸¥È¥ê¤òÁݽü¤·¤Þ¤¹¡£ \fI/var/cache/apt/archives/\fR @@ -152,7 +152,7 @@ apt\-get clean .RE .PP autoclean -.RS 3n +.RS 4 clean ¤ÈƱÍͤˡ¢ autoclean @@ -168,13 +168,13 @@ APT::Clean\-Installed ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-d\fR, \fB\-\-download\-only\fR -.RS 3n +.RS 4 ¥À¥¦¥ó¥í¡¼¥É¤Î¤ß \- ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Î¤ß¤ò¹Ô¤¤¡¢ Ÿ³«¡¦¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::Get::Download\-Only .RE .PP \fB\-f\fR, \fB\-\-fix\-broken\fR -.RS 3n +.RS 4 ½¤Éü \- °Í¸´Ø·¸¤¬²õ¤ì¤¿¥·¥¹¥Æ¥à¤Î½¤Àµ¤ò»î¤ß¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò install ¤ä remove ¤È°ì½ï¤Ë»È¤¦¤È¤­¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ ¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤â¡¢´°Á´¤ËÌäÂê¤ò²ò·è¤·¤Þ¤¹¡£APT ¼«ÂΤϡ¢ ¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸°Í¸´Ø·¸¤òµö¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢ ½é¤á¤Æ APT ¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬Íפˤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£ ¥·¥¹¥Æ¥à¤Î°Í¸´Ø·¸¹½Â¤¤Ë¤«¤Ê¤êÌäÂ꤬¤¢¤ë¾ì¹ç¤Ï¡¢ ¼êÆ°¤Ç½¤Àµ¤¹¤ë¤è¤¦Í׵᤹¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£ (Ä̾ï¤Ï¡¢ÌäÂê¤Î¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¼è¤ê½ü¤¯¤Î¤Ë \fBdselect\fR(8) ¤ä @@ -186,7 +186,7 @@ APT::Get::Fix\-Broken .RE .PP \fB\-m\fR, \fB\-\-ignore\-missing\fR, \fB\-\-fix\-missing\fR -.RS 3n +.RS 4 ·çÍî¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¥Ñ¥Ã¥±¡¼¥¸¤¬¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¤ê¡¢ (¥Ñ¥Ã¥±¡¼¥¸¤ÎÇË»¤Ç) ¼èÆÀ¤·¤¿¸å¤ÎÀ°¹çÀ­¥Á¥§¥Ã¥¯¤òÄ̤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î½èÍý¤òÊÝα¤·ºÇ¸å¤Þ¤Ç½èÍý¤ò³¤±¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò \fB\-f\fR ¥ª¥×¥·¥ç¥ó¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢ ¥¨¥é¡¼¤Ë¤Ê¤ë¾õ¶·¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦ÁªÂò¤·¤Æ¤¤¤ë¾ì¹ç (Æä˥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤ÎÁàºî»þ) ¤ä¡¢ ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¡¢¤Ê¤Ë¤âɽ¼¨¤»¤ºÊÝα¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -194,15 +194,15 @@ APT::Get::Fix\-Missing .RE .PP \fB\-\-no\-download\fR -.RS 3n -¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¤¹¤Ç¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿ .deb ¤ËÂФ·¤Æ¤Î¤ß APT ¤ò¹Ô¤¦¾ì¹ç¤Ë¡¢ +.RS 4 +¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¤¹¤Ç¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤¿ \&.deb ¤ËÂФ·¤Æ¤Î¤ß APT ¤ò¹Ô¤¦¾ì¹ç¤Ë¡¢ \fB\-\-ignore\-missing\fR ¤ÈÊ»¤»¤Æ»È¤¦¤Î¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- APT::Get::Download .RE .PP \fB\-q\fR, \fB\-\-quiet\fR -.RS 3n +.RS 4 ÀÅ½Í \- ¿ÊĽɽ¼¨¤ò¾Êά¤·¡¢ ¥í¥°¤ò¤È¤ë¤Î¤ËÊØÍø¤Ê½ÐÎϤò¹Ô¤¤¤Þ¤¹¡£ ºÇÂç 2 ¤Ä¤Þ¤Ç q ¤ò½Å¤Í¤ë¤³¤È¤Ç¤è¤êÀŽͤˤǤ­¤Þ¤¹¡£ ¤Þ¤¿¡¢\fB\-q=#\fR ¤Î¤è¤¦¤ËÀŽͥì¥Ù¥ë¤ò»ØÄꤷ¤Æ¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ÀŽͥì¥Ù¥ë 2 ¤Ï \fB\-y\fR @@ -211,7 +211,7 @@ quiet .RE .PP \fB\-s\fR, \fB\-\-simulate\fR, \fB\-\-just\-print\fR, \fB\-\-dry\-run\fR, \fB\-\-recon\fR, \fB\-\-no\-act\fR -.RS 3n +.RS 4 Æ°ºî¤Ê¤· \- ¤Ê¤Ë¤¬µ¯¤³¤ë¤Î¤«¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤ò¹Ô¤¤¡¢ ¼ÂºÝ¤Ë¤Ï¥·¥¹¥Æ¥à¤ÎÊѹ¹¤ò¹Ô¤¤¤Þ¤»¤ó¡£ ÀßÄê¹àÌÜ \- APT::Get::Simulate .sp @@ -219,7 +219,7 @@ APT::Get::Simulate .RE .PP \fB\-y\fR, \fB\-\-yes\fR, \fB\-\-assume\-yes\fR -.RS 3n +.RS 4 ¥×¥í¥ó¥×¥È¤Ø¤Î¼«Æ°¾µÂú \- ¤¹¤Ù¤Æ¤Î¥×¥í¥ó¥×¥È¤Ë¼«Æ°Åª¤Ë "yes" ¤ÈÅú¤¨¡¢ÈóÂÐÏÃŪ¤Ë¼Â¹Ô¤·¤Þ¤¹¡£ ÊÝα¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î¾õÂÖ¤òÊѹ¹¤·¤¿¤ê¡¢ ɬ¿Ü¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤è¤¦¤ÊÉÔŬÀڤʾõ¶·¤Î¾ì¹ç¡¢ apt\-get ¤Ï½èÍý¤òÃæÃǤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- @@ -227,25 +227,25 @@ APT::Get::Assume\-Yes .RE .PP \fB\-u\fR, \fB\-\-show\-upgraded\fR -.RS 3n +.RS 4 ¹¹¿·¥Ñ¥Ã¥±¡¼¥¸É½¼¨ \- ¹¹¿·¤µ¤ì¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Show\-Upgraded .RE .PP \fB\-V\fR, \fB\-\-verbose\-versions\fR -.RS 3n +.RS 4 ¹¹¿·¡¦¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥ô¥¡¡¼¥¸¥ç¥ó¤ò¡¢ ¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Show\-Versions .RE .PP \fB\-b\fR, \fB\-\-compile\fR, \fB\-\-build\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¸å¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Compile .RE .PP \fB\-\-ignore\-hold\fR -.RS 3n +.RS 4 ÊÝα¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¥Ñ¥Ã¥±¡¼¥¸¤ÎÊÝα»Ø¼¨¤ò̵»ë¤·¤Æ \fBapt\-get\fR ¤ò¹Ô¤¤¤Þ¤¹¡£ @@ -255,7 +255,7 @@ APT::Ignore\-Hold .RE .PP \fB\-\-no\-upgrade\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¹¹¿·¤Ê¤· \- install ¤ÈƱ»þ¤Ë»ÈÍѤ¹¤ë¤È¡¢no\-upgrade @@ -264,7 +264,7 @@ APT::Get::Upgrade .RE .PP \fB\-\-force\-yes\fR -.RS 3n +.RS 4 ¶¯À©¾µÂú \- APT ¤¬²¿¤«Â»½ý¤òÍ¿¤¨¤«¤Í¤Ê¤¤Æ°ºî¤ò¤·¤è¤¦¤È¤·¤¿¾ì¹ç¤Ç¤â¡¢ ³Îǧ¤ÎÆþÎϤʤ·¤Ç¼Â¹Ô¤·¤Æ¤·¤Þ¤¦´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤è¤Û¤É¤Î¾õ¶·¤Ç¤Ê¤±¤ì¤Ð¡¢»ÈÍѤ·¤Ê¤¤Êý¤¬¤¤¤¤¤Ç¤·¤ç¤¦¡£ force\-yes ¤Ï¡¢¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤«¤Í¤Þ¤»¤ó! ÀßÄê¹àÌÜ \- @@ -272,7 +272,7 @@ APT::Get::force\-yes .RE .PP \fB\-\-print\-uris\fR -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤¹¤ëÂå¤ï¤ê¤Ë¡¢ ¤½¤Î URI ¤òɽ¼¨¤·¤Þ¤¹¡£ URI ¤Ë¤Ï¡¢¥Ñ¥¹¡¢Âоݥե¡¥¤¥ë̾¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¡¢ ͽ¬¤µ¤ì¤ë md5 ¥Ï¥Ã¥·¥å¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ½ÐÎϤ·¤¿¥Õ¥¡¥¤¥ë̾¤¬¡¢ ¾ï¤Ë¥ê¥â¡¼¥È¥µ¥¤¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¡¢ ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤! ¤³¤ì¤Ï source ¥³¥Þ¥ó¥É¡¢ @@ -284,19 +284,19 @@ APT::Get::Print\-URIs .RE .PP \fB\-\-purge\fR -.RS 3n +.RS 4 ºï½ü¤¹¤ëºÝ¡¢¡Öºï½ü¡×¤Ç¤Ï¤Ê¤¯¡Ö´°Á´ºï½ü¡×¤ò¹Ô¤¤¤Þ¤¹¡£ ¡Ö´°Á´ºï½ü¡×¤ò¹Ô¤¦¤È»Ø¼¨¤·¤¿¥Ñ¥Ã¥±¡¼¥¸Ì¾¤Î¸å¤Ë¤Ï¡¢ ¥¢¥¹¥¿¥ê¥¹¥¯ ("*") ¤¬ÉÕ¤­¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Purge .RE .PP \fB\-\-reinstall\fR -.RS 3n +.RS 4 ¤¹¤Ç¤ËºÇ¿·ÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Æ¤â¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- -APT::Get::ReInstall. +APT::Get::ReInstall\&. .RE .PP \fB\-\-list\-cleanup\fR -.RS 3n +.RS 4 ¤³¤Îµ¡Ç½¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç ON ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ OFF ¤Ë¤¹¤ë¤Ë¤Ï \-\-no\-list\-cleanup ¤È¤·¤Æ¤¯¤À¤µ¤¤¡£ ON ¤Î¾ì¹ç¡¢ @@ -304,13 +304,13 @@ APT::Get::ReInstall. ¤Ï¸Å¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤ò³Î¼Â¤Ë¾Ãµî¤¹¤ë¤¿¤á¡¢ ¼«Æ°Åª¤Ë \fI/var/lib/apt/lists\fR ¤ÎÃæ¿È¤ò´ÉÍý¤·¤Þ¤¹¡£ ¤³¤ì¤ò OFF ¤Ë¤¹¤ë¤Î¤Ï¡¢¼èÆÀ¸µ¥ê¥¹¥È¤òÉÑÈˤËÊѹ¹¤¹¤ë»þ¤°¤é¤¤¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- -APT::Get::List\-Cleanup. +APT::Get::List\-Cleanup\&. .RE .PP \fB\-t\fR, \fB\-\-target\-release\fR, \fB\-\-default\-release\fR -.RS 3n +.RS 4 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¥Ý¥ê¥·¡¼¥¨¥ó¥¸¥ó¤Ø¤Î¥Ç¥Õ¥©¥ë¥ÈÆþÎϤòÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢»ØÄꤵ¤ì¤¿¥ê¥ê¡¼¥¹Ê¸»úÎó¤ò»ÈÍѤ·¡¢ ¥Ç¥Õ¥©¥ë¥È pin ¤òÍ¥ÀèÅÙ 990 ¤ÇºîÀ®¤¹¤ë¤³¤È¤Ç¤¹¡£ Í¥Àè¥Õ¥¡¥¤¥ë¤Ï¤³¤ÎÀßÄê¤ò¾å½ñ¤­¤·¤Þ¤¹¡£ Íפ¹¤ë¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¢ ¤É¤ÎÇÛÉۥѥ屡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«¤ò´Êñ¤Ë´ÉÍý¤·¤Þ¤¹¡£ °ìÈÌŪ¤ÊÎã¤È¤·¤Æ¤Ï¡¢ -\fB\-t '2.1*'\fR +\fB\-t \'2\&.1*\'\fR ¤ä \fB\-t unstable\fR ¤Ç¤·¤ç¤¦¡£ ÀßÄê¹àÌÜ \- @@ -320,7 +320,7 @@ APT::Default\-Release .RE .PP \fB\-\-trivial\-only\fR -.RS 3n +.RS 4 ¡Ö½ÅÍפǤʤ¤¡×Áàºî¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ ¤³¤ì¤ÏÏÀÍýŪ¤Ë \fB\-\-assume\-yes\fR ¤ÎÃç´Ö¤È¸«¤Ê¤»¤Þ¤¹¡£ @@ -332,13 +332,13 @@ APT::Get::Trivial\-Only .RE .PP \fB\-\-no\-remove\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤¬ºï½ü¤µ¤ì¤ë¾õ¶·¤Ë¤Ê¤Ã¤¿¤È¤­¡¢ ¥×¥í¥ó¥×¥È¤òɽ¼¨¤»¤ºÃæÃǤ·¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Remove .RE .PP \fB\-\-only\-source\fR -.RS 3n +.RS 4 source ¥³¥Þ¥ó¥É¤È build\-dep @@ -347,108 +347,108 @@ APT::Get::Only\-Source .RE .PP \fB\-\-diff\-only\fR, \fB\-\-tar\-only\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î diff ¥Õ¥¡¥¤¥ë¤ä tar ¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Diff\-Only, APT::Get::Tar\-Only .RE .PP \fB\-\-arch\-only\fR -.RS 3n +.RS 4 ¹½Ã۰͸´Ø·¸¤Î²ò·è¤ò¡¢ ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤¿¤â¤Î¤Î¤ß¹Ô¤¤¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::Arch\-Only .RE .PP \fB\-\-allow\-unauthenticated\fR -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë̵»ë¤·¡¢ ¤½¤ì¤Ë¤Ä¤¤¤Æ¼ÁÌ䤷¤Þ¤»¤ó¡£ pbuilder ¤Î¤è¤¦¤Ê¥Ä¡¼¥ë¤ÇÊØÍø¤Ç¤¹¡£ ÀßÄê¹àÌÜ \- APT::Get::AllowUnauthenticated .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/sources.list\fR -.RS 3n +\fI/etc/apt/sources\&.list\fR +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤Î¼èÆÀ¸µ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::SourceList .RE .PP -\fI/etc/apt/apt.conf\fR -.RS 3n +\fI/etc/apt/apt\&.conf\fR +.RS 4 APT ÀßÄê¥Õ¥¡¥¤¥ë¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Main .RE .PP -\fI/etc/apt/apt.conf.d/\fR -.RS 3n +\fI/etc/apt/apt\&.conf\&.d/\fR +.RS 4 APT ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃÇÊÒ¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Parts .RE .PP \fI/etc/apt/preferences\fR -.RS 3n +.RS 4 ¥Ð¡¼¥¸¥ç¥óÍ¥Àè¥Õ¥¡¥¤¥ë¡£ ¤³¤³¤Ë "pin" ¤ÎÀßÄê¤ò¹Ô¤¤¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢ÊÌ¡¹¤Î¼èÆÀ¸µ¤ä°Û¤Ê¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¡¢ ¤É¤³¤«¤é¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤¹¤ë¤«¤òÀßÄꤷ¤Þ¤¹¡£ ÀßÄê¹àÌÜ \- Dir::Etc::Preferences .RE .PP \fI/var/cache/apt/archives/\fR -.RS 3n +.RS 4 ¼èÆÀºÑ¤ß¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::Cache::Archives .RE .PP \fI/var/cache/apt/archives/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::Cache::Archives (ɬÁ³Åª¤ËÉÔ´°Á´) .RE .PP \fI/var/lib/apt/lists/\fR -.RS 3n +.RS 4 \fBsources.list\fR(5) ¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹ÆÃÍ­¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists .RE .PP \fI/var/lib/apt/lists/partial/\fR -.RS 3n +.RS 4 ¼èÆÀÃæ¤Î¾õÂÖ¾ðÊó³ÊǼ¥¨¥ê¥¢¡£ ÀßÄê¹àÌÜ \- Dir::State::Lists (ɬÁ³Åª¤ËÉÔ´°Á´) .RE .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8), -\fBapt\-cdrom\fR(8), +\fBapt-cache\fR(8), +\fBapt-cdrom\fR(8), \fBdpkg\fR(8), \fBdselect\fR(8), \fBsources.list\fR(5), \fBapt.conf\fR(5), -\fBapt\-config\fR(8), /usr/share/doc/apt/ ¤Î APT ¥æ¡¼¥¶¡¼¥º¥¬¥¤¥É, +\fBapt-config\fR(8), /usr/share/doc/apt/ ¤Î APT ¥æ¡¼¥¶¡¼¥º¥¬¥¤¥É, \fBapt_preferences\fR(5), APT Howto .SH "¿ÇÃÇ¥á¥Ã¥»¡¼¥¸" .PP @@ -456,29 +456,31 @@ Dir::State::Lists ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-key.8 b/doc/ja/apt-key.8 index a4808ee..89830d9 100644 --- a/doc/ja/apt-key.8 +++ b/doc/ja/apt-key.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-key +.\" Title: apt-key .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 December 2003 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-key \- APT ¥­¡¼´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-key \- APT ¥­¡¼´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 8 \fBapt\-key\fR [\fIcommand\fR/] [\fB\fIarguments\fR\fR...] @@ -24,7 +24,7 @@ apt\-key \- APT .SH "¥³¥Þ¥ó¥É" .PP add \fIfilename\fR -.RS 3n +.RS 4 ¿®Íꥭ¡¼°ìÍ÷¤Ë¿·¤·¤¤¥­¡¼¤òÄɲä·¤Þ¤¹¡£ ¤³¤Î¥­¡¼¤Ï \fIfilename\fR @@ -36,76 +36,78 @@ add \fIfilename\fR .RE .PP del \fIkeyid\fR -.RS 3n +.RS 4 ¿®Íꥭ¡¼°ìÍ÷¤«¤é¥­¡¼¤òºï½ü¤·¤Þ¤¹¡£ .RE .PP list -.RS 3n +.RS 4 ¿®Íꥭ¡¼¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ .RE .PP update -.RS 3n +.RS 4 Debian ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ç¡¢¥í¡¼¥«¥ë¥­¡¼¥ê¥ó¥°¤ò¹¹¿·¤·¡¢ ¤â¤¦Í­¸ú¤Ç¤Ê¤¤¥­¡¼¤ò¥­¡¼¥ê¥ó¥°¤«¤éºï½ü¤·¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/trusted.gpg\fR -.RS 3n +\fI/etc/apt/trusted\&.gpg\fR +.RS 4 ¥í¡¼¥«¥ë¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥°¡£ ¿·¤·¤¤¥­¡¼¤Ï¤³¤³¤ËÄɲ䵤ì¤Þ¤¹¡£ .RE .PP -\fI/etc/apt/trustdb.gpg\fR -.RS 3n +\fI/etc/apt/trustdb\&.gpg\fR +.RS 4 ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Î¥í¡¼¥«¥ë¿®Íê¥Ç¡¼¥¿¥Ù¡¼¥¹ .RE .PP -\fI/usr/share/keyrings/debian\-archive\-keyring.gpg\fR -.RS 3n +\fI/usr/share/keyrings/debian\-archive\-keyring\&.gpg\fR +.RS 4 Debian ¥¢¡¼¥«¥¤¥Ö¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥° .RE .PP -\fI/usr/share/keyrings/debian\-archive\-removed\-keys.gpg\fR -.RS 3n +\fI/usr/share/keyrings/debian\-archive\-removed\-keys\&.gpg\fR +.RS 4 ºï½ü¤µ¤ì¤¿ Debian ¥¢¡¼¥«¥¤¥Ö¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥° .RE .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-get\fR(8), -\fBapt\-secure\fR(8) +\fBapt-get\fR(8), +\fBapt-secure\fR(8) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ãø¼Ô" .PP APT ¤Ï the APT team - + ¤Ë¤è¤Ã¤Æ ½ñ¤«¤ì¤Þ¤·¤¿¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-key.ja.8 b/doc/ja/apt-key.ja.8 index a4808ee..89830d9 100644 --- a/doc/ja/apt-key.ja.8 +++ b/doc/ja/apt-key.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-key +.\" Title: apt-key .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 December 2003 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-key \- APT ¥­¡¼´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-key \- APT ¥­¡¼´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 8 \fBapt\-key\fR [\fIcommand\fR/] [\fB\fIarguments\fR\fR...] @@ -24,7 +24,7 @@ apt\-key \- APT .SH "¥³¥Þ¥ó¥É" .PP add \fIfilename\fR -.RS 3n +.RS 4 ¿®Íꥭ¡¼°ìÍ÷¤Ë¿·¤·¤¤¥­¡¼¤òÄɲä·¤Þ¤¹¡£ ¤³¤Î¥­¡¼¤Ï \fIfilename\fR @@ -36,76 +36,78 @@ add \fIfilename\fR .RE .PP del \fIkeyid\fR -.RS 3n +.RS 4 ¿®Íꥭ¡¼°ìÍ÷¤«¤é¥­¡¼¤òºï½ü¤·¤Þ¤¹¡£ .RE .PP list -.RS 3n +.RS 4 ¿®Íꥭ¡¼¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ .RE .PP update -.RS 3n +.RS 4 Debian ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ç¡¢¥í¡¼¥«¥ë¥­¡¼¥ê¥ó¥°¤ò¹¹¿·¤·¡¢ ¤â¤¦Í­¸ú¤Ç¤Ê¤¤¥­¡¼¤ò¥­¡¼¥ê¥ó¥°¤«¤éºï½ü¤·¤Þ¤¹¡£ .RE .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/trusted.gpg\fR -.RS 3n +\fI/etc/apt/trusted\&.gpg\fR +.RS 4 ¥í¡¼¥«¥ë¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥°¡£ ¿·¤·¤¤¥­¡¼¤Ï¤³¤³¤ËÄɲ䵤ì¤Þ¤¹¡£ .RE .PP -\fI/etc/apt/trustdb.gpg\fR -.RS 3n +\fI/etc/apt/trustdb\&.gpg\fR +.RS 4 ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Î¥í¡¼¥«¥ë¿®Íê¥Ç¡¼¥¿¥Ù¡¼¥¹ .RE .PP -\fI/usr/share/keyrings/debian\-archive\-keyring.gpg\fR -.RS 3n +\fI/usr/share/keyrings/debian\-archive\-keyring\&.gpg\fR +.RS 4 Debian ¥¢¡¼¥«¥¤¥Ö¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥° .RE .PP -\fI/usr/share/keyrings/debian\-archive\-removed\-keys.gpg\fR -.RS 3n +\fI/usr/share/keyrings/debian\-archive\-removed\-keys\&.gpg\fR +.RS 4 ºï½ü¤µ¤ì¤¿ Debian ¥¢¡¼¥«¥¤¥Ö¿®Íꥭ¡¼¤Î¥­¡¼¥ê¥ó¥° .RE .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-get\fR(8), -\fBapt\-secure\fR(8) +\fBapt-get\fR(8), +\fBapt-secure\fR(8) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ãø¼Ô" .PP APT ¤Ï the APT team - + ¤Ë¤è¤Ã¤Æ ½ñ¤«¤ì¤Þ¤·¤¿¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-secure.8 b/doc/ja/apt-secure.8 index 6467796..74f736d 100644 --- a/doc/ja/apt-secure.8 +++ b/doc/ja/apt-secure.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-secure +.\" Title: apt-secure .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 December 2003 .\" Manual: .\" Source: Linux @@ -11,11 +11,11 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-secure \- APT ¥¢¡¼¥«¥¤¥Öǧ¾Ú¥µ¥Ý¡¼¥È +apt-secure \- APT ¥¢¡¼¥«¥¤¥Öǧ¾Ú¥µ¥Ý¡¼¥È .SH "ÀâÌÀ" .PP -¥Ð¡¼¥¸¥ç¥ó 0.6 ¤è¤ê¡¢\fBapt\fR +¥Ð¡¼¥¸¥ç¥ó 0\&.6 ¤è¤ê¡¢\fBapt\fR Á´¥¢¡¼¥«¥¤¥Ö¤ËÂФ¹¤ë Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¥Á¥§¥Ã¥¯¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ Release ¥Õ¥¡¥¤¥ë½ð̾¥­¡¼¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¿Í¤¬¡¢ ¥¢¡¼¥«¥¤¥Ö¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÊѹ¹¤¬³Î¼Â¤Ë¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ .PP @@ -25,7 +25,7 @@ apt\-secure \- APT .PP -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBaptitude\fR(8), \fBsynaptic\fR(8) ¤È¤¤¤Ã¤¿¥Ñ¥Ã¥±¡¼¥¸¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ï¡¢ ¤³¤Î¿·Ç§¾Úµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ @@ -49,16 +49,18 @@ Debian ¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë¡¢¸¡¾Ú¤·¤Æ¥¢¡¼¥«¥¤¥Ö¤Ë³ÊǼ¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¥á¥ó¥Æ¥Ê¤Î½ð̾¤ò¤Ï¤¬¤µ¤ì¡¢ MD5 sum ¤ò·×»»¤µ¤ì¤Æ¡¢ Packages ¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£ ¤½¤Î¸å¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î MD5 sum ¤ò·×»»¤·¤Æ¤«¤é¡¢ Release ¥Õ¥¡¥¤¥ë¤ËÃÖ¤­¤Þ¤¹¡£ Release ¥Õ¥¡¥¤¥ë¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ç½ð̾¤µ¤ì¤Þ¤¹¡£ ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ïǯ¤´¤È¤ËºîÀ®¤µ¤ì¡¢FTP ¥µ¡¼¥Ð¤ÇÇÛÉÛ¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¥­¡¼¤â Debian ¥­¡¼¥ê¥ó¥°¤Ë´Þ¤Þ¤ì¤Þ¤¹¡£ .PP -¥¨¥ó¥É¥æ¡¼¥¶¤Ïï¤Ç¤â¡¢Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¥Á¥§¥Ã¥¯¤·¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤òÃê½Ð¤·¤Æ¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤ÈÈæ³Ó¤Ç¤­¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 0.6 °ÊÁ°¤Ç¤Ï¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿ Debian ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤·¤«¡¢ ¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£ ¸½ºß¤Ç¤Ï¡¢MD5 sum ¤È Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÎξÊý¤Ç¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ +¥¨¥ó¥É¥æ¡¼¥¶¤Ïï¤Ç¤â¡¢Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¥Á¥§¥Ã¥¯¤·¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤òÃê½Ð¤·¤Æ¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤ÈÈæ³Ó¤Ç¤­¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 0\&.6 °ÊÁ°¤Ç¤Ï¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿ Debian ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤·¤«¡¢ ¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£ ¸½ºß¤Ç¤Ï¡¢MD5 sum ¤È Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÎξÊý¤Ç¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ .PP °Ê¾å¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Î½ð̾¥Á¥§¥Ã¥¯¤È¤Ï°ã¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê²¼¤Î¤è¤¦¤Ë¹Í¤¨¤é¤ì¤ë 2 ¼ïÎà¤Î¹¶·â¤òËɤ°¤è¤¦À߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ -.TP 3n -\(bu -¥Í¥Ã¥È¥ï¡¼¥¯Ãæ´Ö¼Ô¹¶·â +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Í¥Ã¥È¥ï¡¼¥¯Ãæ´Ö¼Ô¹¶·â ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢ °­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥Ñ¥Ã¥±¡¼¥¸¥À¥¦¥ó¥í¡¼¥É¥×¥í¥»¥¹¤Ë³ä¤ê¹þ¤ó¤À¤ê¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯¹½À®Í×ÁÇ (¥ë¡¼¥¿¡¢¥¹¥¤¥Ã¥Á¤Ê¤É) ¤ÎÀ©¸æ¤ä¡¢ °­´Á¥µ¡¼¥Ð¤Ø¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥È¥é¥Õ¥£¥Ã¥¯¤Î¥ê¥À¥¤¥ì¥¯¥È¤Ê¤É (arp ·Ðͳ¤ä DNS ¥¹¥×¡¼¥Õ¥£¥ó¥°¹¶·â) ¤Ç¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤òÄϤޤµ¤ì¤¿¤ê¤·¤Þ¤¹¡£ -.TP 3n -\(bu -¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯´¶À÷. ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢°­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥ß¥é¡¼¥Û¥¹¥È¤Ë´¶À÷¤·¡¢ ¤³¤Î¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬ÅÁÇŤ¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯´¶À÷\&. ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢°­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥ß¥é¡¼¥Û¥¹¥È¤Ë´¶À÷¤·¡¢ ¤³¤Î¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬ÅÁÇŤ¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£ +.RE .PP ¤·¤«¤·¤³¤ì¤Ï¡¢ (¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤¹¤ë) Debian ¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð¼«ÂΤδ¶À÷¤ä¡¢ Release ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¤Î¤Ë»ÈÍѤ·¤¿¥­¡¼¤Î´¶À÷¤òËɤ²¤Þ¤»¤ó¡£ ¤¤¤º¤ì¤Ë¤»¤è¡¢¤³¤Îµ¡¹½¤Ï¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Î½ð̾¤òÊä´°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .SH "¥æ¡¼¥¶¤ÎÀßÄê" @@ -74,57 +76,60 @@ Debian ¿·¤·¤¤¥­¡¼¤òÄɲ乤뤿¤á¤Ë¤Ï¡¢¤Þ¤º¥­¡¼¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ (¼èÆÀ¤¹¤ëºÝ¤Ë¤Ï¡¢¿®Íê¤Ç¤­¤ëÄÌ¿®¥Á¥ã¥Í¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¡¢ÆäËα°Õ¤·¤Æ¤¯¤À¤µ¤¤) ¼èÆÀ¤·¤¿¥­¡¼¤ò¡¢\fBapt\-key\fR ¤ÇÄɲä·¡¢ \fBapt\-get update\fR -¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê¾å¤Ë¤è¤ê¡¢apt ¤Ï»ØÄꤷ¤¿¥¢¡¼¥«¥¤¥Ö¤«¤é¡¢\fIRelease.gpg\fR +¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê¾å¤Ë¤è¤ê¡¢apt ¤Ï»ØÄꤷ¤¿¥¢¡¼¥«¥¤¥Ö¤«¤é¡¢\fIRelease\&.gpg\fR ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¡¦¸¡¾Ú¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .SH "¥¢¡¼¥«¥¤¥Ö¤ÎÀßÄê" .PP ¤¢¤Ê¤¿¤¬¥á¥ó¥Æ¥Ê¥ó¥¹¤·¤Æ¤¤¤ë¥¢¡¼¥«¥¤¥Ö¤Ç¡¢¥¢¡¼¥«¥¤¥Ö½ð̾¤òÄ󶡤·¤¿¤¤¾ì¹ç¡¢ °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -¾å°Ì Release ¥Õ¥¡¥¤¥ë¤ÎºîÀ® +.sp +.RS 4 +\h'-04'\(bu\h'+03'¾å°Ì Release ¥Õ¥¡¥¤¥ë¤ÎºîÀ® ´û¤Ë¤³¤ì¤¬Â¸ºß¤·¤Æ¤¤¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ \fBapt\-ftparchive release\fR (apt\-utils ¤ÇÄó¶¡) ¤ò¼Â¹Ô¤·¤ÆºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -½ð̾ -\fBgpg \-abs \-o Release.gpg Release\fR +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'½ð̾ +\fBgpg \-abs \-o Release\&.gpg Release\fR ¤ò¼Â¹Ô¤·¤Æ¡¢ ½ð̾¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -¥­¡¼¤Î»ØÌæ¤òÇÛÉÛ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥­¡¼¤Î»ØÌæ¤òÇÛÉÛ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Õ¥¡¥¤¥ëǧ¾Ú¤Ë¡¢ ¤É¤Î¥­¡¼¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëɬÍפ¬¤¢¤ë¤«¤ò¡¢ ¥æ¡¼¥¶¤ËÃΤ餻¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE .PP ¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍƤËÊѲ½¤¬¤¢¤ë¾ì¹ç (¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ÎÄɲääºï½ü)¡¢ ¥¢¡¼¥«¥¤¥Ö¥á¥ó¥Æ¥Ê¤ÏÁ°½Ò¤ÎºÇ½é¤Î 1, 2 ¥¹¥Æ¥Ã¥×¤Ë½¾¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ .SH "´ØÏ¢¹àÌÜ" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBsources.list\fR(5), -\fBapt\-key\fR(8), -\fBapt\-archive\fR(1), +\fBapt-key\fR(8), +\fBapt-ftparchive\fR(1), \fBdebsign\fR(1) -\fBdebsig\-verify\fR(1), +\fBdebsig-verify\fR(1), \fBgpg\fR(1) .PP ¾ÜºÙ¤ÊÇطʾðÊó¤ò¸¡¾Ú¤¹¤ë¤Î¤Ê¤é¡¢ the Securing Debian Manual (harden\-doc ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â¤¢¤ê¤Þ¤¹) ¤Î -[1]\&\fIDebian Security Infrastructure\fR -¾Ï¤È¡¢ V. Alex Brennen ¤Ë¤è¤ë -[2]\&\fIStrong Distribution HOWTO\fR +\fIDebian Security Infrastructure\fR\&[1] +¾Ï¤È¡¢ V\&. Alex Brennen ¤Ë¤è¤ë +\fIStrong Distribution HOWTO\fR\&[2] ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "¥Ð¥°" .PP -[3]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[3]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ãø¼Ô" .PP APT ¤Ï the APT team - + ¤Ë¤è¤Ã¤Æ ½ñ¤«¤ì¤Þ¤·¤¿¡£ .SH "¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸É®¼Ô" .PP @@ -132,25 +137,31 @@ APT .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ Debian Security Infrastructure -\%http://www.debian.org/doc/manuals/securing\-debian\-howto/ch7.en.html -.TP 3 -2.\ Strong Distribution HOWTO +.SH "NOTES" +.IP " 1." 4 +Debian Security Infrastructure +.RS 4 +\%http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html +.RE +.IP " 2." 4 +Strong Distribution HOWTO +.RS 4 \%http://www.cryptnet.net/fdp/crypto/strong_distro.html -.TP 3 -3.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.RE +.IP " 3." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-secure.ja.8 b/doc/ja/apt-secure.ja.8 index 6467796..74f736d 100644 --- a/doc/ja/apt-secure.ja.8 +++ b/doc/ja/apt-secure.ja.8 @@ -1,6 +1,6 @@ -.\" Title: apt\-secure +.\" Title: apt-secure .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 14 December 2003 .\" Manual: .\" Source: Linux @@ -11,11 +11,11 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-secure \- APT ¥¢¡¼¥«¥¤¥Öǧ¾Ú¥µ¥Ý¡¼¥È +apt-secure \- APT ¥¢¡¼¥«¥¤¥Öǧ¾Ú¥µ¥Ý¡¼¥È .SH "ÀâÌÀ" .PP -¥Ð¡¼¥¸¥ç¥ó 0.6 ¤è¤ê¡¢\fBapt\fR +¥Ð¡¼¥¸¥ç¥ó 0\&.6 ¤è¤ê¡¢\fBapt\fR Á´¥¢¡¼¥«¥¤¥Ö¤ËÂФ¹¤ë Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¥Á¥§¥Ã¥¯¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ Release ¥Õ¥¡¥¤¥ë½ð̾¥­¡¼¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¿Í¤¬¡¢ ¥¢¡¼¥«¥¤¥Ö¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÊѹ¹¤¬³Î¼Â¤Ë¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ .PP @@ -25,7 +25,7 @@ apt\-secure \- APT .PP -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBaptitude\fR(8), \fBsynaptic\fR(8) ¤È¤¤¤Ã¤¿¥Ñ¥Ã¥±¡¼¥¸¥Õ¥í¥ó¥È¥¨¥ó¥É¤Ï¡¢ ¤³¤Î¿·Ç§¾Úµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ @@ -49,16 +49,18 @@ Debian ¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë¡¢¸¡¾Ú¤·¤Æ¥¢¡¼¥«¥¤¥Ö¤Ë³ÊǼ¤·¤Þ¤¹¡£ ¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¥á¥ó¥Æ¥Ê¤Î½ð̾¤ò¤Ï¤¬¤µ¤ì¡¢ MD5 sum ¤ò·×»»¤µ¤ì¤Æ¡¢ Packages ¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£ ¤½¤Î¸å¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Î MD5 sum ¤ò·×»»¤·¤Æ¤«¤é¡¢ Release ¥Õ¥¡¥¤¥ë¤ËÃÖ¤­¤Þ¤¹¡£ Release ¥Õ¥¡¥¤¥ë¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ç½ð̾¤µ¤ì¤Þ¤¹¡£ ¥¢¡¼¥«¥¤¥Ö¥­¡¼¤Ïǯ¤´¤È¤ËºîÀ®¤µ¤ì¡¢FTP ¥µ¡¼¥Ð¤ÇÇÛÉÛ¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¥­¡¼¤â Debian ¥­¡¼¥ê¥ó¥°¤Ë´Þ¤Þ¤ì¤Þ¤¹¡£ .PP -¥¨¥ó¥É¥æ¡¼¥¶¤Ïï¤Ç¤â¡¢Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¥Á¥§¥Ã¥¯¤·¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤òÃê½Ð¤·¤Æ¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤ÈÈæ³Ó¤Ç¤­¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 0.6 °ÊÁ°¤Ç¤Ï¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿ Debian ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤·¤«¡¢ ¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£ ¸½ºß¤Ç¤Ï¡¢MD5 sum ¤È Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÎξÊý¤Ç¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ +¥¨¥ó¥É¥æ¡¼¥¶¤Ïï¤Ç¤â¡¢Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ò¥Á¥§¥Ã¥¯¤·¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤òÃê½Ð¤·¤Æ¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤ÈÈæ³Ó¤Ç¤­¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 0\&.6 °ÊÁ°¤Ç¤Ï¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿ Debian ¥Ñ¥Ã¥±¡¼¥¸¤Î MD5 sum ¤·¤«¡¢ ¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£ ¸½ºß¤Ç¤Ï¡¢MD5 sum ¤È Release ¥Õ¥¡¥¤¥ë¤Î½ð̾¤ÎξÊý¤Ç¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£ .PP °Ê¾å¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Î½ð̾¥Á¥§¥Ã¥¯¤È¤Ï°ã¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê²¼¤Î¤è¤¦¤Ë¹Í¤¨¤é¤ì¤ë 2 ¼ïÎà¤Î¹¶·â¤òËɤ°¤è¤¦À߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ -.TP 3n -\(bu -¥Í¥Ã¥È¥ï¡¼¥¯Ãæ´Ö¼Ô¹¶·â +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Í¥Ã¥È¥ï¡¼¥¯Ãæ´Ö¼Ô¹¶·â ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢ °­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥Ñ¥Ã¥±¡¼¥¸¥À¥¦¥ó¥í¡¼¥É¥×¥í¥»¥¹¤Ë³ä¤ê¹þ¤ó¤À¤ê¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯¹½À®Í×ÁÇ (¥ë¡¼¥¿¡¢¥¹¥¤¥Ã¥Á¤Ê¤É) ¤ÎÀ©¸æ¤ä¡¢ °­´Á¥µ¡¼¥Ð¤Ø¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥È¥é¥Õ¥£¥Ã¥¯¤Î¥ê¥À¥¤¥ì¥¯¥È¤Ê¤É (arp ·Ðͳ¤ä DNS ¥¹¥×¡¼¥Õ¥£¥ó¥°¹¶·â) ¤Ç¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤òÄϤޤµ¤ì¤¿¤ê¤·¤Þ¤¹¡£ -.TP 3n -\(bu -¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯´¶À÷. ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢°­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥ß¥é¡¼¥Û¥¹¥È¤Ë´¶À÷¤·¡¢ ¤³¤Î¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬ÅÁÇŤ¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥ß¥é¡¼¥Í¥Ã¥È¥ï¡¼¥¯´¶À÷\&. ½ð̾¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤¤È¡¢°­°Õ¤¢¤ë¥¨¡¼¥¸¥§¥ó¥È¤¬¥ß¥é¡¼¥Û¥¹¥È¤Ë´¶À÷¤·¡¢ ¤³¤Î¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¡¢ °­°Õ¤¢¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬ÅÁÇŤ¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£ +.RE .PP ¤·¤«¤·¤³¤ì¤Ï¡¢ (¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤¹¤ë) Debian ¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð¼«ÂΤδ¶À÷¤ä¡¢ Release ¥Õ¥¡¥¤¥ë¤Ë½ð̾¤¹¤ë¤Î¤Ë»ÈÍѤ·¤¿¥­¡¼¤Î´¶À÷¤òËɤ²¤Þ¤»¤ó¡£ ¤¤¤º¤ì¤Ë¤»¤è¡¢¤³¤Îµ¡¹½¤Ï¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Î½ð̾¤òÊä´°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .SH "¥æ¡¼¥¶¤ÎÀßÄê" @@ -74,57 +76,60 @@ Debian ¿·¤·¤¤¥­¡¼¤òÄɲ乤뤿¤á¤Ë¤Ï¡¢¤Þ¤º¥­¡¼¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ (¼èÆÀ¤¹¤ëºÝ¤Ë¤Ï¡¢¿®Íê¤Ç¤­¤ëÄÌ¿®¥Á¥ã¥Í¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¡¢ÆäËα°Õ¤·¤Æ¤¯¤À¤µ¤¤) ¼èÆÀ¤·¤¿¥­¡¼¤ò¡¢\fBapt\-key\fR ¤ÇÄɲä·¡¢ \fBapt\-get update\fR -¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê¾å¤Ë¤è¤ê¡¢apt ¤Ï»ØÄꤷ¤¿¥¢¡¼¥«¥¤¥Ö¤«¤é¡¢\fIRelease.gpg\fR +¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£ °Ê¾å¤Ë¤è¤ê¡¢apt ¤Ï»ØÄꤷ¤¿¥¢¡¼¥«¥¤¥Ö¤«¤é¡¢\fIRelease\&.gpg\fR ¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¡¦¸¡¾Ú¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .SH "¥¢¡¼¥«¥¤¥Ö¤ÎÀßÄê" .PP ¤¢¤Ê¤¿¤¬¥á¥ó¥Æ¥Ê¥ó¥¹¤·¤Æ¤¤¤ë¥¢¡¼¥«¥¤¥Ö¤Ç¡¢¥¢¡¼¥«¥¤¥Ö½ð̾¤òÄ󶡤·¤¿¤¤¾ì¹ç¡¢ °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -¾å°Ì Release ¥Õ¥¡¥¤¥ë¤ÎºîÀ® +.sp +.RS 4 +\h'-04'\(bu\h'+03'¾å°Ì Release ¥Õ¥¡¥¤¥ë¤ÎºîÀ® ´û¤Ë¤³¤ì¤¬Â¸ºß¤·¤Æ¤¤¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ \fBapt\-ftparchive release\fR (apt\-utils ¤ÇÄó¶¡) ¤ò¼Â¹Ô¤·¤ÆºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -½ð̾ -\fBgpg \-abs \-o Release.gpg Release\fR +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'½ð̾ +\fBgpg \-abs \-o Release\&.gpg Release\fR ¤ò¼Â¹Ô¤·¤Æ¡¢ ½ð̾¤·¤Æ¤¯¤À¤µ¤¤¡£ -.TP 3n -\(bu -¥­¡¼¤Î»ØÌæ¤òÇÛÉÛ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥­¡¼¤Î»ØÌæ¤òÇÛÉÛ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Õ¥¡¥¤¥ëǧ¾Ú¤Ë¡¢ ¤É¤Î¥­¡¼¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëɬÍפ¬¤¢¤ë¤«¤ò¡¢ ¥æ¡¼¥¶¤ËÃΤ餻¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ +.RE .PP ¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍƤËÊѲ½¤¬¤¢¤ë¾ì¹ç (¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ÎÄɲääºï½ü)¡¢ ¥¢¡¼¥«¥¤¥Ö¥á¥ó¥Æ¥Ê¤ÏÁ°½Ò¤ÎºÇ½é¤Î 1, 2 ¥¹¥Æ¥Ã¥×¤Ë½¾¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ .SH "´ØÏ¢¹àÌÜ" .PP \fBapt.conf\fR(5), -\fBapt\-get\fR(8), +\fBapt-get\fR(8), \fBsources.list\fR(5), -\fBapt\-key\fR(8), -\fBapt\-archive\fR(1), +\fBapt-key\fR(8), +\fBapt-ftparchive\fR(1), \fBdebsign\fR(1) -\fBdebsig\-verify\fR(1), +\fBdebsig-verify\fR(1), \fBgpg\fR(1) .PP ¾ÜºÙ¤ÊÇطʾðÊó¤ò¸¡¾Ú¤¹¤ë¤Î¤Ê¤é¡¢ the Securing Debian Manual (harden\-doc ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â¤¢¤ê¤Þ¤¹) ¤Î -[1]\&\fIDebian Security Infrastructure\fR -¾Ï¤È¡¢ V. Alex Brennen ¤Ë¤è¤ë -[2]\&\fIStrong Distribution HOWTO\fR +\fIDebian Security Infrastructure\fR\&[1] +¾Ï¤È¡¢ V\&. Alex Brennen ¤Ë¤è¤ë +\fIStrong Distribution HOWTO\fR\&[2] ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "¥Ð¥°" .PP -[3]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[3]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ãø¼Ô" .PP APT ¤Ï the APT team - + ¤Ë¤è¤Ã¤Æ ½ñ¤«¤ì¤Þ¤·¤¿¡£ .SH "¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸É®¼Ô" .PP @@ -132,25 +137,31 @@ APT .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .SH "COPYRIGHT" -Copyright \(co 1998\-2001 Jason Gunthorpe +Copyright \(co 1998-2001 Jason Gunthorpe .br -.SH "REFERENCES" -.TP 3 -1.\ Debian Security Infrastructure -\%http://www.debian.org/doc/manuals/securing\-debian\-howto/ch7.en.html -.TP 3 -2.\ Strong Distribution HOWTO +.SH "NOTES" +.IP " 1." 4 +Debian Security Infrastructure +.RS 4 +\%http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html +.RE +.IP " 2." 4 +Strong Distribution HOWTO +.RS 4 \%http://www.cryptnet.net/fdp/crypto/strong_distro.html -.TP 3 -3.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.RE +.IP " 3." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index 5b9612a..20c57fb 100644 --- a/doc/ja/apt-secure.ja.8.xml +++ b/doc/ja/apt-secure.ja.8.xml @@ -282,7 +282,7 @@ Create a toplevel Release file. if it does not exist already. You can do this by running apt-ftparchive release - (provided inftp apt-utils). + (provided in package apt-utils). --> 上位 Release ファイルの作成 既にこれが存在しているのでなければ、 @@ -325,7 +325,7 @@ --> 関連項目 -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; diff --git a/doc/ja/apt-sortpkgs.1 b/doc/ja/apt-sortpkgs.1 index 48e62fb..d9190e7 100644 --- a/doc/ja/apt-sortpkgs.1 +++ b/doc/ja/apt-sortpkgs.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-sortpkgs +.\" Title: apt-sortpkgs .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-sortpkgs \- ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥½¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-sortpkgs \- ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥½¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 13 \fBapt\-sortpkgs\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] \fIfile\fR... @@ -29,31 +29,31 @@ apt\-sortpkgs \- ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-s\fR, \fB\-\-source\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥£¡¼¥ë¥É½ç¤ËʤÙÂؤ¨ ÀßÄê¹àÌÜ \- -APT::SortPkgs::Source. +APT::SortPkgs::Source\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -67,29 +67,31 @@ APT::SortPkgs::Source. ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt-sortpkgs.ja.1 b/doc/ja/apt-sortpkgs.ja.1 index 48e62fb..d9190e7 100644 --- a/doc/ja/apt-sortpkgs.ja.1 +++ b/doc/ja/apt-sortpkgs.ja.1 @@ -1,6 +1,6 @@ -.\" Title: apt\-sortpkgs +.\" Title: apt-sortpkgs .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -11,7 +11,7 @@ .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -apt\-sortpkgs \- ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥½¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£ +apt-sortpkgs \- ¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥½¡¼¥È¥æ¡¼¥Æ¥£¥ê¥Æ¥£ .SH "SYNOPSIS" .HP 13 \fBapt\-sortpkgs\fR [\fB\-hvs\fR] [\fB\-o=\fR\fB\fIconfig\ string\fR\fR] [\fB\-c=\fR\fB\fIfile\fR\fR] \fIfile\fR... @@ -29,31 +29,31 @@ apt\-sortpkgs \- ¤Ê¤É¤Î¤è¤¦¤Ë¤·¤Æ¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£ .PP \fB\-s\fR, \fB\-\-source\fR -.RS 3n +.RS 4 ¥½¡¼¥¹¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥£¡¼¥ë¥É½ç¤ËʤÙÂؤ¨ ÀßÄê¹àÌÜ \- -APT::SortPkgs::Source. +APT::SortPkgs::Source\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR -.RS 3n +.RS 4 »È¤¤Êý¤Îû¤¤Í×Ìó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-v\fR, \fB\-\-version\fR -.RS 3n +.RS 4 ¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£ .RE .PP \fB\-c\fR, \fB\-\-config\-file\fR -.RS 3n +.RS 4 ÀßÄê¥Õ¥¡¥¤¥ë¡£ »ÈÍѤ¹¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬Æɤá¤Ê¤¤¾ì¹ç¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£ ʸˡ¤Ë¤Ä¤¤¤Æ¤Ï \fBapt.conf\fR(5) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP \fB\-o\fR, \fB\-\-option\fR -.RS 3n +.RS 4 ÀßÄꥪ¥×¥·¥ç¥ó¤Î¥»¥Ã¥È¡£Ç¤°Õ¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ʸˡ¤Ï \fB\-o Foo::Bar=bar\fR ¤È¤Ê¤ê¤Þ¤¹¡£ @@ -67,29 +67,31 @@ APT::SortPkgs::Source. ¤ÏÀµ¾ï½ªÎ»»þ¤Ë 0 ¤òÊÖ¤·¤Þ¤¹¡£ ¥¨¥é¡¼»þ¤Ë¤Ï½½¿Ê¤Î 100 ¤òÊÖ¤·¤Þ¤¹¡£ .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt.conf.5 b/doc/ja/apt.conf.5 index d3ea028..a7dcd3e 100644 --- a/doc/ja/apt.conf.5 +++ b/doc/ja/apt.conf.5 @@ -1,11 +1,11 @@ .\" Title: apt.conf .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT.CONF" "5" "29 February 2004" "Linux" "" +.TH "APT\&.CONF" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,7 @@ apt.conf \- APT ÀßÄê¥Õ¥¡¥¤¥ë .SH "ÀâÌÀ" .PP -\fIapt.conf\fR +\fIapt\&.conf\fR ¤Ï¡¢ APT ¥Ä¡¼¥ë½¸¤Î¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤È¶¦Ä̤Υ³¥Þ¥ó¥É¥é¥¤¥ó¥Ñ¡¼¥µ¤ò»È¤Ã¤Æ¡¢ ¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¤òÅý°ì´Ä¶­¤Ç»ÈÍѤǤ­¤Þ¤¹¡£ APT ¥Ä¡¼¥ë¤Îµ¯Æ°»þ¤Ë¤Ï¡¢\fBAPT_CONFIG\fR ´Ä¶­ÊÑ¿ô¤Ë»ØÄꤷ¤¿ÀßÄê¤ò (¸ºß¤¹¤ì¤Ð) Æɤ߹þ¤ß¤Þ¤¹¡£ ¼¡¤Ë Dir::Etc::Parts @@ -30,7 +30,7 @@ APT::Get::Assume\-Yes // ¤Ç»Ï¤Þ¤ë¹Ô¤Ï¥³¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹ (̵»ë)¡£ ¤¤¤º¤ì¤Î¹Ô¤â¡¢ .sp -.RS 3n +.RS 4 .nf APT::Get::Assume\-Yes "true"; .fi @@ -38,7 +38,7 @@ APT::Get::Assume\-Yes "true"; .sp ¤Î ¤è¤¦¤Ê·Á¼°¤Ç¤¹¡£ ¹ÔËö¤Î¥»¥ß¥³¥í¥ó¤ÏɬÍפǤ¹¤¬¡¢¥À¥Ö¥ë¥¯¥©¡¼¥È¤Ï»È¤ï¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ °Ê²¼¤Î¤è¤¦¤ËÃ楫¥Ã¥³¤ò»È¤¦¤È¡¢¿·¤·¤¤¥¹¥³¡¼¥×¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf APT { @@ -52,15 +52,15 @@ APT { .PP ¤Þ¤¿Å¬µ¹²þ¹Ô¤¹¤ë¤³¤È¤Ç¡¢¤è¤êÆɤߤ䤹¤¯¤Ê¤ê¤Þ¤¹¡£ ¥ê¥¹¥È¤Ï¡¢³«¤¤¤¿¥¹¥³¡¼¥×¡¢¥¯¥©¡¼¥È¤Ç°Ï¤Þ¤ì¤¿Ã±¸ì¡¢ ¤½¤·¤Æ¥»¥ß¥³¥í¥ó¤È³¤±¤ë¤³¤È¤ÇºîÀ®¤Ç¤­¤Þ¤¹¡£ ¥»¥ß¥³¥í¥ó¤Ç¶èÀڤ뤳¤È¤Ç¡¢Ê£¿ô¤Î¥¨¥ó¥È¥ê¤òɽ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; .fi .RE .PP -\fI/usr/share/doc/apt/examples/apt.conf\fR -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/apt\&.conf\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤Ï°ìÈÌŪ¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤Ç¤¹¡£ ¤É¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤«»²¹Í¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ .PP #include @@ -79,66 +79,66 @@ APT::Get::Assume\-Yes) ¤³¤Î¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢¥Ä¡¼¥ëÁ´ÂΤ˱ƶÁ¤Î¤¢¤ë¡¢ °ìÈÌŪ¤Ê APT ¤Î¿¶¤ëÉñ¤¤¤òÀ©¸æ¤·¤Þ¤¹¡£ .PP Architecture -.RS 3n +.RS 4 ¥·¥¹¥Æ¥à¥¢¡¼¥­¥Æ¥¯¥Á¥ã \- ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤¿¤ê¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò²òÀϤ¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ÆâÉô¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ apt ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤¹¡£ .RE .PP Ignore\-Hold -.RS 3n +.RS 4 ÊÝα¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¤³¤Î¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥ó¤Ï¡¢ ÌäÂê²ò·è´ï¤ËÊÝα¤È»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò̵»ë¤·¤Þ¤¹¡£ .RE .PP Clean\-Installed -.RS 3n +.RS 4 ¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ç¤¹¡£autoclean µ¡Ç½¤¬ on ¤Î»þ¡¢ ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£ off ¤Î¾ì¹ç¡¢¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ºï½üÂоݤ«¤é³°¤·¤Þ¤¹¡£ ¤·¤«¤·¡¢ APT ¤Ï¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ò¡¢ ľÀÜÄ󶡤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Immediate\-Configure -.RS 3n +.RS 4 ¨»þÀßÄê̵¸ú \- ¤³¤Î´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢ APT ¤ÎÍ׵ᥳ¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ dpkg ¤Î¸Æ¤Ó½Ð¤·¤ò¤Û¤È¤ó¤É¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÃÙ¤¤¥·¥ó¥°¥ë¥æ¡¼¥¶¥·¥¹¥Æ¥à¤Ç¤ÏɬÍפ«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢ Èó¾ï¤Ë´í¸±¤Ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤¬¼ºÇÔ¤·¤¿¤ê¡¢ ¤â¤·¤¯¤Ï¤â¤Ã¤È°­¤¤¤³¤È¤¬¤ª¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¼«¸ÊÀÕǤ¤Ç»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Force\-LoopBreak -.RS 3n +.RS 4 ²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤«¡ÖËÜÅö¤Ë¡×Ƚ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ÀäÂФˤ³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ ÉԲķç (essential) ¥Ñ¥Ã¥±¡¼¥¸Æ±»Î¤Ç¡¢ ¶¥¹ç (Conflicts) /¶¥¹ç¤ä¶¥¹ç/»öÁ°°Í¸ (Pre\-Depend) ¤Î¥ë¡¼¥×¤ËÍî¤Á¹þ¤ó¤À¤È¤­¤Ë¡¢ ÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ò°ì»þŪ¤Ëºï½ü¤·¤Æ¥ë¡¼¥×¤òÈ´¤±¤é¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ \fI¤½¤ó¤Ê¥ë¡¼¥×¤Ï¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤Ç¡¢ ¤¢¤ë¤È¤¹¤ì¤Ð½ÅÂç¤Ê¥Ð¥°¤Ç¤¹¡£\fR ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢tar, gzip, libc, dpkg, bash ¤È¤½¤ì¤é¤¬°Í¸¤·¤Æ¤¤¤ë ¥Ñ¥Ã¥±¡¼¥¸°Ê³°¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ÇÆ°ºî¤·¤Þ¤¹¡£ .RE .PP Cache\-Limit -.RS 3n +.RS 4 APT ¤Ï¡ÖÍøÍѲÄǽ¡×¾ðÊó¤ò³ÊǼ¤¹¤ë¤¿¤á¤Ë¡¢ ¸ÇÄꥵ¥¤¥º¤Î¥á¥â¥ê¥Þ¥Ã¥×¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¤½¤Î¥­¥ã¥Ã¥·¥å¥µ¥¤¥º¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP Build\-Essential -.RS 3n +.RS 4 ¹½Ã۰͸´Ø·¸¤ÇÉԲķç¤Ê¥Ñ¥Ã¥±¡¼¥¸¤òÄêµÁ¤·¤Þ¤¹¡£ .RE .PP Get -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó Get ¤Ï -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Cache -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó Cache ¤Ï -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP CDROM -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó CDROM ¤Ï -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .SH "ACQUIRE ¥°¥ë¡¼¥×" @@ -147,7 +147,7 @@ Acquire ¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ä URI ¥Ï¥ó¥É¥é¤ÎÀ©¸æ¤ò¹Ô¤¤¤Þ¤¹¡£ .PP Queue\-Mode -.RS 3n +.RS 4 ¥­¥å¡¼¥â¡¼¥É \- Queue\-Mode ¤Ï¡¢ APT ¤¬¤É¤Î¤è¤¦¤ËÊÂÎóÀܳ¤ò¹Ô¤¦¤«¡¢ @@ -162,17 +162,17 @@ access .RE .PP Retries -.RS 3n +.RS 4 ¥ê¥È¥é¥¤¤Î²ó¿ô¤òÀßÄꤷ¤Þ¤¹¡£ 0 ¤Ç¤Ê¤¤¾ì¹ç¡¢APT ¤Ï¼ºÇÔ¤·¤¿¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¡¢ Í¿¤¨¤é¤ì¤¿²ó¿ô¤À¤±¥ê¥È¥é¥¤¤ò¹Ô¤¤¤Þ¤¹¡£ .RE .PP Source\-Symlinks -.RS 3n +.RS 4 ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»ÈÍѤ·¤Þ¤¹¡£ true ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¤È¤­¡¢²Äǽ¤Ê¤é¥³¥Ô¡¼¤ÎÂå¤ï¤ê¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬ Ä¥¤é¤ì¤Þ¤¹¡£true ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£ .RE .PP http -.RS 3n +.RS 4 HTTP URI \- http::Proxy ¤Ï¡¢ ¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë http ¥×¥í¥­¥·¤Ç¤¹¡£ http://[[user][:pass]@]host[:port]/ ¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¡£¥Û¥¹¥È¤´¤È¤Î¥×¥í¥­¥·¤Î¾ì¹ç¤Ï¡¢ @@ -183,17 +183,17 @@ DIRECT \fBhttp_proxy\fR ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£ .sp -HTTP/1.1 ½àµò¤Î¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤ÎÀ©¸æ¤Ë¤Ä¤¤¤Æ¡¢ 3 ¼ïÎà¤ÎÀßÄ꤬¤¢¤ê¤Þ¤¹¡£No\-Cache +HTTP/1\&.1 ½àµò¤Î¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤ÎÀ©¸æ¤Ë¤Ä¤¤¤Æ¡¢ 3 ¼ïÎà¤ÎÀßÄ꤬¤¢¤ê¤Þ¤¹¡£No\-Cache ¤Ï¥×¥í¥­¥·¤ËÂФ·¤Æ¡¢ ¤¤¤«¤Ê¤ë»þ¤â¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ·¤Ê¤¤¤ÈÅÁ¤¨¤Þ¤¹¡£ Max\-Age ¤Ï¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÍѤΤȤ­¤À¤±Á÷¿®¤·¡¢ ÆÀ¤é¤ì¤¿»þ´Ö¤è¤ê¤â¸Å¤«¤Ã¤¿¾ì¹ç¤Ë¡¢ ¥ª¥Ö¥¸¥§¥¯¥È¤ò¥ê¥Õ¥ì¥Ã¥·¥å¤¹¤ë¤è¤¦¥­¥ã¥Ã¥·¥å¤Ë»Ø¼¨¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 1 Æü¤È¤Ê¤Ã¤Æ¤¤¤ë¤¿¤á¡¢ Debian ¤ÏÆüËè¤Ë¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤¹¡£ No\-Store -¤Ï¡¢¥­¥ã¥Ã¥·¥å¤¬¤³¤Î¥ê¥¯¥¨¥¹¥È¤ò³ÊǼ¤»¤º¡¢ ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¤ßÀßÄꤹ¤ë¤è¤¦»ØÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÂ礭¤Ê .deb ¥Õ¥¡¥¤¥ë¤Ç¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤¬±ø¤ì¤ë¤Î¤ò¡¢ Ëɤ°¤Î¤ËÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£ Ãí) Squid 2.0.2 ¤Ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£ +¤Ï¡¢¥­¥ã¥Ã¥·¥å¤¬¤³¤Î¥ê¥¯¥¨¥¹¥È¤ò³ÊǼ¤»¤º¡¢ ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¤ßÀßÄꤹ¤ë¤è¤¦»ØÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÂ礭¤Ê \&.deb ¥Õ¥¡¥¤¥ë¤Ç¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤¬±ø¤ì¤ë¤Î¤ò¡¢ Ëɤ°¤Î¤ËÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£ Ãí) Squid 2\&.0\&.2 ¤Ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£ .sp timeout ¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¤³¤ÎÊýË¡¤Ç¤Î¥¿¥¤¥à¥¢¥¦¥È¤Þ¤Ç¤Î»þ´Ö¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ë¤Ï¡¢Àܳ¤Î¥¿¥¤¥à¥¢¥¦¥È¤È¥Ç¡¼¥¿¤Î¥¿¥¤¥à¥¢¥¦¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ .sp -¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬ RFC ½àµò¤Ç¤Ê¤«¤Ã¤¿¤ê¡¢ (Squid 2.0.2 ¤Î¤è¤¦¤Ë) ¥Ð¥°¤¬¤¢¤Ã¤¿¤ê¤·¤¿¤È¤­¤Î¤¿¤á¤Ë¡¢ ¥Ñ¥¤¥×¥é¥¤¥ó¤Î¿¼¤µ¤ÎÀ©¸æ¤òÀßÄꤷ¤Þ¤¹¡£ +¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬ RFC ½àµò¤Ç¤Ê¤«¤Ã¤¿¤ê¡¢ (Squid 2\&.0\&.2 ¤Î¤è¤¦¤Ë) ¥Ð¥°¤¬¤¢¤Ã¤¿¤ê¤·¤¿¤È¤­¤Î¤¿¤á¤Ë¡¢ ¥Ñ¥¤¥×¥é¥¤¥ó¤Î¿¼¤µ¤ÎÀ©¸æ¤òÀßÄꤷ¤Þ¤¹¡£ Acquire::http::Pipeline\-Depth ¤Ë¤è¤ê¡¢ APT ¤¬Á÷¿®¤Ç¤­¤ë¥ê¥¯¥¨¥¹¥È¤Î²ó¿ô¤ò 0 ¤«¤é 5 ¤ÎÃͤÇÀßÄê¤Ç¤­¤Þ¤¹¡£ ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬Å¬ÀڤǤʤ¯¡¢TCP Àܳ¤Ë»þ´Ö¤¬¤«¤«¤ë¤È¤­¤Ï¡¢ \fIɬ¤º\fR @@ -201,7 +201,7 @@ Acquire::http::Pipeline\-Depth .RE .PP ftp -.RS 3n +.RS 4 FTP URI \- ftp::Proxy ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë¥×¥í¥­¥·¥µ¡¼¥Ð¤Ç¤¹¡£ ftp://[[user][:pass]@]host[:port]/ ¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¤¬¡¢ ´Ä¶­ÊÑ¿ô @@ -209,7 +209,7 @@ ftp://[[user][:pass]@]host[:port]/ ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£ ftp ¥×¥í¥­¥·¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ë ftp::ProxyLogin ¥¹¥¯¥ê¥×¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ËÁ÷¿®¤¹¤ëÀܳ¥³¥Þ¥ó¥É¤ò¡¢¤³¤Î¥¨¥ó¥È¥ê¤ËÀßÄꤷ¤Þ¤¹¡£ ¤É¤Î¤è¤¦¤Ë¤¹¤ë¤Î¤«¤Ï -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¾¤Ë¤â¡¢$(PROXY_USER) $(PROXY_PASS) $(SITE_USER) @@ -236,14 +236,14 @@ EPRT .RE .PP cdrom -.RS 3n +.RS 4 CDROM URI \- ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ÎÀßÄê¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ \fI/etc/fstab\fR ¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢ CDROM ¥É¥é¥¤¥Ö¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ò cdrom::Mount ¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ (SMB ¥Þ¥¦¥ó¥È¤ä¸Å¤¤ mount ¥Ñ¥Ã¥±¡¼¥¸¤Ê¤É) ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤¬ fstab ¤Ëµ­½Ò¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤«¤ï¤ê¤Ë¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¥³¥Þ¥ó¥É¤â»ÈÍѤǤ­¤Þ¤¹¡£ ʸˡ¤Ï¡¢cdrom ¥Ö¥í¥Ã¥¯¤ò .sp -.RS 3n +.RS 4 .nf "/cdrom/"::Mount "foo"; .fi @@ -253,7 +253,7 @@ cdrom::Mount .RE .PP gpgv -.RS 3n +.RS 4 GPGV URI \- GPGV URI ÍѤÎÍ£°ì¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ gpgv ¤ËÅϤ¹Äɲåѥé¥á¡¼¥¿¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ gpgv::Options gpgv ¤ËÅϤ¹Äɲ媥ץ·¥ç¥ó¡£ @@ -272,7 +272,7 @@ Dir::State ¤Ë¤Ï¡¢ \fI/\fR ¤ä -\fI./\fR +\fI\&./\fR ¤Ç»Ï¤Þ¤é¤Ê¤¤ Á´¥µ¥Ö¥¢¥¤¥Æ¥à¤ËÉղ乤롢¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£ .PP Dir::Cache @@ -318,26 +318,26 @@ DSelect ¥»¥¯¥·¥ç¥ó°Ê²¼¤ÎÀßÄê¹àÌܤǡ¢ ¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤òÀ©¸æ¤·¤Þ¤¹¡£ .PP Clean -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥¯¥ê¡¼¥ó¥â¡¼¥É \- ¤³¤ÎÃÍ¤Ï always, prompt, auto, pre\-auto, never ¤Î¤¦¤Á¤Ò¤È¤Ä¤ò¼è¤ê¤Þ¤¹¡£ always ¤È prompt ¤Ï¹¹¿·¸å¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£ (¥Ç¥Õ¥©¥ë¥È¤Î) prompt ¤Ç¤Ï¾ò·ïÉÕ¤­¤Çºï½ü¤·¤Þ¤¹¡£ auto ¤Ï¥À¥¦¥ó¥í¡¼¥ÉÉÔǽ¥Ñ¥Ã¥±¡¼¥¸ (Î㤨¤Ð¿·¥Ð¡¼¥¸¥ç¥ó¤ÇÃÖ¤­´¹¤¨¤é¤ì¤¿¤â¤Î) ¤òºï½ü¤·¤Þ¤¹¡£pre\-auto ¤Ï¤³¤ÎÆ°ºî¤ò¡¢ ¿·¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëľÁ°¤Ë¹Ô¤¤¤Þ¤¹¡£ .RE .PP options -.RS 3n +.RS 4 ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢ install »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍÍ¤Ë -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP Updateoptions -.RS 3n +.RS 4 ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢ update »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍÍ¤Ë -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP PromptAfterUpdate -.RS 3n +.RS 4 true ¤Î¾ì¹ç¡¢ \fBdselect\fR(8) ¤Î [U]pdate ¼Â¹Ô»þ¤Ë¡¢Â³¹Ô¤Î¤¿¤á¤Î¥×¥í¥ó¥×¥È¤òËè²óɽ¼¨¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£ @@ -351,14 +351,14 @@ DPkg ¥»¥¯¥·¥ç¥ó¤Ë¤¢¤ê¤Þ¤¹¡£ .PP options -.RS 3n +.RS 4 dpkg ¤ËÅϤ¹¥ª¥×¥·¥ç¥ó¤Î¥ê¥¹¥È¤Ç¤¹¡£ ¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ê¥¹¥Èµ­Ë¡¤ò»ÈÍѤ·¤Æ»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ ¤Þ¤¿¡¢³Æ¥ê¥¹¥È¤Ïñ°ì¤Î°ú¿ô¤È¤·¤Æ \fBdpkg\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP Pre\-Invoke, Post\-Invoke -.RS 3n +.RS 4 \fBdpkg\fR(8) ¤ò¸Æ¤Ó½Ð¤¹Á°¸å¤Ç¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£ options @@ -368,13 +368,13 @@ options .RE .PP Pre\-Install\-Pkgs -.RS 3n +.RS 4 \fBdpkg\fR(8) ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£ options ¤Î¤è¤¦¤Ë¥ê¥¹¥Èµ­Ë¡¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ ¥³¥Þ¥ó¥É¤Ï \fI/bin/sh\fR -¤òÄ̤·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢ ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£ APT ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ëÁ´ .deb ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò¡¢ ¤Ò¤È¤Ä¤º¤Ä¥³¥Þ¥ó¥É¤Îɸ½àÆþÎϤËÁ÷¤ê¤Þ¤¹¡£ +¤òÄ̤·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢ ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£ APT ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ëÁ´ \&.deb ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò¡¢ ¤Ò¤È¤Ä¤º¤Ä¥³¥Þ¥ó¥É¤Îɸ½àÆþÎϤËÁ÷¤ê¤Þ¤¹¡£ .sp ¤³¤Î¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤Ç¤Ï¡¢(¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤ä APT ÀßÄꥹ¥Ú¡¼¥¹¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤à) ¾ÜºÙ¾ðÊó¤ä¥Õ¥¡¥¤¥ë¡¢ Êѹ¹¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ·¤Þ¤¹¡£ DPkg::Tools::options::cmd::Version @@ -386,16 +386,16 @@ Pre\-Install\-Pkgs .RE .PP Run\-Directory -.RS 3n +.RS 4 APT ¤Ï dpkg ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï \fI/\fR ¤Ç¤¹¡£ .RE .PP Build\-options -.RS 3n +.RS 4 ¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë -\fBdpkg\-buildpackage\fR(1) +\fBdpkg-buildpackage\fR(1) ¤ËÅϤµ¤ì¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢½ð̾¤ò̵¸ú¤Ë¤·¡¢Á´¥Ð¥¤¥Ê¥ê¤òÀ¸À®¤·¤Þ¤¹¡£ .RE .SH "¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó" @@ -412,41 +412,43 @@ Debug::Acquire::gpgv gpgv Ë¡¤Î¥Ç¥Ð¥Ã¥°¤Ç¤¹¡£ .SH "Îã" .PP -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤Ë¡¢Á´ÍøÍѲÄǽ¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»²¾È¤Ç¤­¤ë¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤¬¤¢¤ê¤Þ¤¹¡£ .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8), -\fBapt\-config\fR(8), -\fBapt_preferences\fR(5). +\fBapt-cache\fR(8), +\fBapt-config\fR(8), +\fBapt_preferences\fR(5)\&. .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt.conf.ja.5 b/doc/ja/apt.conf.ja.5 index d3ea028..a7dcd3e 100644 --- a/doc/ja/apt.conf.ja.5 +++ b/doc/ja/apt.conf.ja.5 @@ -1,11 +1,11 @@ .\" Title: apt.conf .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "APT.CONF" "5" "29 February 2004" "Linux" "" +.TH "APT\&.CONF" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,7 @@ apt.conf \- APT ÀßÄê¥Õ¥¡¥¤¥ë .SH "ÀâÌÀ" .PP -\fIapt.conf\fR +\fIapt\&.conf\fR ¤Ï¡¢ APT ¥Ä¡¼¥ë½¸¤Î¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤¹¡£ ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤È¶¦Ä̤Υ³¥Þ¥ó¥É¥é¥¤¥ó¥Ñ¡¼¥µ¤ò»È¤Ã¤Æ¡¢ ¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¤òÅý°ì´Ä¶­¤Ç»ÈÍѤǤ­¤Þ¤¹¡£ APT ¥Ä¡¼¥ë¤Îµ¯Æ°»þ¤Ë¤Ï¡¢\fBAPT_CONFIG\fR ´Ä¶­ÊÑ¿ô¤Ë»ØÄꤷ¤¿ÀßÄê¤ò (¸ºß¤¹¤ì¤Ð) Æɤ߹þ¤ß¤Þ¤¹¡£ ¼¡¤Ë Dir::Etc::Parts @@ -30,7 +30,7 @@ APT::Get::Assume\-Yes // ¤Ç»Ï¤Þ¤ë¹Ô¤Ï¥³¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹ (̵»ë)¡£ ¤¤¤º¤ì¤Î¹Ô¤â¡¢ .sp -.RS 3n +.RS 4 .nf APT::Get::Assume\-Yes "true"; .fi @@ -38,7 +38,7 @@ APT::Get::Assume\-Yes "true"; .sp ¤Î ¤è¤¦¤Ê·Á¼°¤Ç¤¹¡£ ¹ÔËö¤Î¥»¥ß¥³¥í¥ó¤ÏɬÍפǤ¹¤¬¡¢¥À¥Ö¥ë¥¯¥©¡¼¥È¤Ï»È¤ï¤Ê¤¯¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ °Ê²¼¤Î¤è¤¦¤ËÃ楫¥Ã¥³¤ò»È¤¦¤È¡¢¿·¤·¤¤¥¹¥³¡¼¥×¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf APT { @@ -52,15 +52,15 @@ APT { .PP ¤Þ¤¿Å¬µ¹²þ¹Ô¤¹¤ë¤³¤È¤Ç¡¢¤è¤êÆɤߤ䤹¤¯¤Ê¤ê¤Þ¤¹¡£ ¥ê¥¹¥È¤Ï¡¢³«¤¤¤¿¥¹¥³¡¼¥×¡¢¥¯¥©¡¼¥È¤Ç°Ï¤Þ¤ì¤¿Ã±¸ì¡¢ ¤½¤·¤Æ¥»¥ß¥³¥í¥ó¤È³¤±¤ë¤³¤È¤ÇºîÀ®¤Ç¤­¤Þ¤¹¡£ ¥»¥ß¥³¥í¥ó¤Ç¶èÀڤ뤳¤È¤Ç¡¢Ê£¿ô¤Î¥¨¥ó¥È¥ê¤òɽ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf DPkg::Pre\-Install\-Pkgs {"/usr/sbin/dpkg\-preconfigure \-\-apt";}; .fi .RE .PP -\fI/usr/share/doc/apt/examples/apt.conf\fR -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/apt\&.conf\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤Ï°ìÈÌŪ¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤Ç¤¹¡£ ¤É¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤«»²¹Í¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£ .PP #include @@ -79,66 +79,66 @@ APT::Get::Assume\-Yes) ¤³¤Î¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢¥Ä¡¼¥ëÁ´ÂΤ˱ƶÁ¤Î¤¢¤ë¡¢ °ìÈÌŪ¤Ê APT ¤Î¿¶¤ëÉñ¤¤¤òÀ©¸æ¤·¤Þ¤¹¡£ .PP Architecture -.RS 3n +.RS 4 ¥·¥¹¥Æ¥à¥¢¡¼¥­¥Æ¥¯¥Á¥ã \- ¥Õ¥¡¥¤¥ë¤ò¼èÆÀ¤·¤¿¤ê¡¢ ¥Ñ¥Ã¥±¡¼¥¸¥ê¥¹¥È¤ò²òÀϤ¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£ ÆâÉô¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ apt ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤¹¡£ .RE .PP Ignore\-Hold -.RS 3n +.RS 4 ÊÝα¥Ñ¥Ã¥±¡¼¥¸¤Î̵»ë \- ¤³¤Î¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥ó¤Ï¡¢ ÌäÂê²ò·è´ï¤ËÊÝα¤È»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò̵»ë¤·¤Þ¤¹¡£ .RE .PP Clean\-Installed -.RS 3n +.RS 4 ¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ç¤¹¡£autoclean µ¡Ç½¤¬ on ¤Î»þ¡¢ ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤¯¤Ê¤Ã¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£ off ¤Î¾ì¹ç¡¢¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ºï½üÂоݤ«¤é³°¤·¤Þ¤¹¡£ ¤·¤«¤·¡¢ APT ¤Ï¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤¿¥Ñ¥Ã¥±¡¼¥¸¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤ò¡¢ ľÀÜÄ󶡤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Immediate\-Configure -.RS 3n +.RS 4 ¨»þÀßÄê̵¸ú \- ¤³¤Î´í¸±¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢ APT ¤ÎÍ׵ᥳ¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ dpkg ¤Î¸Æ¤Ó½Ð¤·¤ò¤Û¤È¤ó¤É¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÃÙ¤¤¥·¥ó¥°¥ë¥æ¡¼¥¶¥·¥¹¥Æ¥à¤Ç¤ÏɬÍפ«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢ Èó¾ï¤Ë´í¸±¤Ç¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤¬¼ºÇÔ¤·¤¿¤ê¡¢ ¤â¤·¤¯¤Ï¤â¤Ã¤È°­¤¤¤³¤È¤¬¤ª¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¼«¸ÊÀÕǤ¤Ç»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Force\-LoopBreak -.RS 3n +.RS 4 ²¿¤ò¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Î¤«¡ÖËÜÅö¤Ë¡×Ƚ¤Ã¤Æ¤¤¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ÀäÂФˤ³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ ÉԲķç (essential) ¥Ñ¥Ã¥±¡¼¥¸Æ±»Î¤Ç¡¢ ¶¥¹ç (Conflicts) /¶¥¹ç¤ä¶¥¹ç/»öÁ°°Í¸ (Pre\-Depend) ¤Î¥ë¡¼¥×¤ËÍî¤Á¹þ¤ó¤À¤È¤­¤Ë¡¢ ÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ò°ì»þŪ¤Ëºï½ü¤·¤Æ¥ë¡¼¥×¤òÈ´¤±¤é¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ \fI¤½¤ó¤Ê¥ë¡¼¥×¤Ï¤¢¤êÆÀ¤Ê¤¤¤Ï¤º¤Ç¡¢ ¤¢¤ë¤È¤¹¤ì¤Ð½ÅÂç¤Ê¥Ð¥°¤Ç¤¹¡£\fR ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢tar, gzip, libc, dpkg, bash ¤È¤½¤ì¤é¤¬°Í¸¤·¤Æ¤¤¤ë ¥Ñ¥Ã¥±¡¼¥¸°Ê³°¤ÎÉԲķç¥Ñ¥Ã¥±¡¼¥¸¤ÇÆ°ºî¤·¤Þ¤¹¡£ .RE .PP Cache\-Limit -.RS 3n +.RS 4 APT ¤Ï¡ÖÍøÍѲÄǽ¡×¾ðÊó¤ò³ÊǼ¤¹¤ë¤¿¤á¤Ë¡¢ ¸ÇÄꥵ¥¤¥º¤Î¥á¥â¥ê¥Þ¥Ã¥×¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¤½¤Î¥­¥ã¥Ã¥·¥å¥µ¥¤¥º¤ò»ØÄꤷ¤Þ¤¹¡£ .RE .PP Build\-Essential -.RS 3n +.RS 4 ¹½Ã۰͸´Ø·¸¤ÇÉԲķç¤Ê¥Ñ¥Ã¥±¡¼¥¸¤òÄêµÁ¤·¤Þ¤¹¡£ .RE .PP Get -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó Get ¤Ï -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP Cache -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó Cache ¤Ï -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP CDROM -.RS 3n +.RS 4 ¥µ¥Ö¥»¥¯¥·¥ç¥ó CDROM ¤Ï -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¥Ä¡¼¥ë¤òÀ©¸æ¤·¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¤Îʸ½ñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .SH "ACQUIRE ¥°¥ë¡¼¥×" @@ -147,7 +147,7 @@ Acquire ¥ª¥×¥·¥ç¥ó¥°¥ë¡¼¥×¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤ä URI ¥Ï¥ó¥É¥é¤ÎÀ©¸æ¤ò¹Ô¤¤¤Þ¤¹¡£ .PP Queue\-Mode -.RS 3n +.RS 4 ¥­¥å¡¼¥â¡¼¥É \- Queue\-Mode ¤Ï¡¢ APT ¤¬¤É¤Î¤è¤¦¤ËÊÂÎóÀܳ¤ò¹Ô¤¦¤«¡¢ @@ -162,17 +162,17 @@ access .RE .PP Retries -.RS 3n +.RS 4 ¥ê¥È¥é¥¤¤Î²ó¿ô¤òÀßÄꤷ¤Þ¤¹¡£ 0 ¤Ç¤Ê¤¤¾ì¹ç¡¢APT ¤Ï¼ºÇÔ¤·¤¿¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¡¢ Í¿¤¨¤é¤ì¤¿²ó¿ô¤À¤±¥ê¥È¥é¥¤¤ò¹Ô¤¤¤Þ¤¹¡£ .RE .PP Source\-Symlinks -.RS 3n +.RS 4 ¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»ÈÍѤ·¤Þ¤¹¡£ true ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¤È¤­¡¢²Äǽ¤Ê¤é¥³¥Ô¡¼¤ÎÂå¤ï¤ê¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬ Ä¥¤é¤ì¤Þ¤¹¡£true ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£ .RE .PP http -.RS 3n +.RS 4 HTTP URI \- http::Proxy ¤Ï¡¢ ¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë http ¥×¥í¥­¥·¤Ç¤¹¡£ http://[[user][:pass]@]host[:port]/ ¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¡£¥Û¥¹¥È¤´¤È¤Î¥×¥í¥­¥·¤Î¾ì¹ç¤Ï¡¢ @@ -183,17 +183,17 @@ DIRECT \fBhttp_proxy\fR ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£ .sp -HTTP/1.1 ½àµò¤Î¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤ÎÀ©¸æ¤Ë¤Ä¤¤¤Æ¡¢ 3 ¼ïÎà¤ÎÀßÄ꤬¤¢¤ê¤Þ¤¹¡£No\-Cache +HTTP/1\&.1 ½àµò¤Î¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤ÎÀ©¸æ¤Ë¤Ä¤¤¤Æ¡¢ 3 ¼ïÎà¤ÎÀßÄ꤬¤¢¤ê¤Þ¤¹¡£No\-Cache ¤Ï¥×¥í¥­¥·¤ËÂФ·¤Æ¡¢ ¤¤¤«¤Ê¤ë»þ¤â¥­¥ã¥Ã¥·¥å¤ò»ÈÍѤ·¤Ê¤¤¤ÈÅÁ¤¨¤Þ¤¹¡£ Max\-Age ¤Ï¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ëÍѤΤȤ­¤À¤±Á÷¿®¤·¡¢ ÆÀ¤é¤ì¤¿»þ´Ö¤è¤ê¤â¸Å¤«¤Ã¤¿¾ì¹ç¤Ë¡¢ ¥ª¥Ö¥¸¥§¥¯¥È¤ò¥ê¥Õ¥ì¥Ã¥·¥å¤¹¤ë¤è¤¦¥­¥ã¥Ã¥·¥å¤Ë»Ø¼¨¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 1 Æü¤È¤Ê¤Ã¤Æ¤¤¤ë¤¿¤á¡¢ Debian ¤ÏÆüËè¤Ë¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤¹¡£ No\-Store -¤Ï¡¢¥­¥ã¥Ã¥·¥å¤¬¤³¤Î¥ê¥¯¥¨¥¹¥È¤ò³ÊǼ¤»¤º¡¢ ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¤ßÀßÄꤹ¤ë¤è¤¦»ØÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÂ礭¤Ê .deb ¥Õ¥¡¥¤¥ë¤Ç¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤¬±ø¤ì¤ë¤Î¤ò¡¢ Ëɤ°¤Î¤ËÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£ Ãí) Squid 2.0.2 ¤Ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£ +¤Ï¡¢¥­¥ã¥Ã¥·¥å¤¬¤³¤Î¥ê¥¯¥¨¥¹¥È¤ò³ÊǼ¤»¤º¡¢ ¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¤ßÀßÄꤹ¤ë¤è¤¦»ØÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢Èó¾ï¤ËÂ礭¤Ê \&.deb ¥Õ¥¡¥¤¥ë¤Ç¥×¥í¥­¥·¥­¥ã¥Ã¥·¥å¤¬±ø¤ì¤ë¤Î¤ò¡¢ Ëɤ°¤Î¤ËÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£ Ãí) Squid 2\&.0\&.2 ¤Ç¤Ï¡¢¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£ .sp timeout ¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¤³¤ÎÊýË¡¤Ç¤Î¥¿¥¤¥à¥¢¥¦¥È¤Þ¤Ç¤Î»þ´Ö¤òÀßÄꤷ¤Þ¤¹¡£ ¤³¤ì¤Ë¤Ï¡¢Àܳ¤Î¥¿¥¤¥à¥¢¥¦¥È¤È¥Ç¡¼¥¿¤Î¥¿¥¤¥à¥¢¥¦¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ .sp -¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬ RFC ½àµò¤Ç¤Ê¤«¤Ã¤¿¤ê¡¢ (Squid 2.0.2 ¤Î¤è¤¦¤Ë) ¥Ð¥°¤¬¤¢¤Ã¤¿¤ê¤·¤¿¤È¤­¤Î¤¿¤á¤Ë¡¢ ¥Ñ¥¤¥×¥é¥¤¥ó¤Î¿¼¤µ¤ÎÀ©¸æ¤òÀßÄꤷ¤Þ¤¹¡£ +¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬ RFC ½àµò¤Ç¤Ê¤«¤Ã¤¿¤ê¡¢ (Squid 2\&.0\&.2 ¤Î¤è¤¦¤Ë) ¥Ð¥°¤¬¤¢¤Ã¤¿¤ê¤·¤¿¤È¤­¤Î¤¿¤á¤Ë¡¢ ¥Ñ¥¤¥×¥é¥¤¥ó¤Î¿¼¤µ¤ÎÀ©¸æ¤òÀßÄꤷ¤Þ¤¹¡£ Acquire::http::Pipeline\-Depth ¤Ë¤è¤ê¡¢ APT ¤¬Á÷¿®¤Ç¤­¤ë¥ê¥¯¥¨¥¹¥È¤Î²ó¿ô¤ò 0 ¤«¤é 5 ¤ÎÃͤÇÀßÄê¤Ç¤­¤Þ¤¹¡£ ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬Å¬ÀڤǤʤ¯¡¢TCP Àܳ¤Ë»þ´Ö¤¬¤«¤«¤ë¤È¤­¤Ï¡¢ \fIɬ¤º\fR @@ -201,7 +201,7 @@ Acquire::http::Pipeline\-Depth .RE .PP ftp -.RS 3n +.RS 4 FTP URI \- ftp::Proxy ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤ¹¤ë¥×¥í¥­¥·¥µ¡¼¥Ð¤Ç¤¹¡£ ftp://[[user][:pass]@]host[:port]/ ¤È¤¤¤¦É¸½à·Á¤Çɽ¤·¤Þ¤¹¤¬¡¢ ´Ä¶­ÊÑ¿ô @@ -209,7 +209,7 @@ ftp://[[user][:pass]@]host[:port]/ ¤Ç¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£ ftp ¥×¥í¥­¥·¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ë ftp::ProxyLogin ¥¹¥¯¥ê¥×¥È¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ËÁ÷¿®¤¹¤ëÀܳ¥³¥Þ¥ó¥É¤ò¡¢¤³¤Î¥¨¥ó¥È¥ê¤ËÀßÄꤷ¤Þ¤¹¡£ ¤É¤Î¤è¤¦¤Ë¤¹¤ë¤Î¤«¤Ï -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤ÎÎã¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¾¤Ë¤â¡¢$(PROXY_USER) $(PROXY_PASS) $(SITE_USER) @@ -236,14 +236,14 @@ EPRT .RE .PP cdrom -.RS 3n +.RS 4 CDROM URI \- ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ÎÀßÄê¤Î¤ß¤ò¹Ô¤¤¤Þ¤¹¡£ \fI/etc/fstab\fR ¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢ CDROM ¥É¥é¥¤¥Ö¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ò cdrom::Mount ¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ (SMB ¥Þ¥¦¥ó¥È¤ä¸Å¤¤ mount ¥Ñ¥Ã¥±¡¼¥¸¤Ê¤É) ¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤¬ fstab ¤Ëµ­½Ò¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤«¤ï¤ê¤Ë¥Þ¥¦¥ó¥È¡¦¥¢¥ó¥Þ¥¦¥ó¥È¥³¥Þ¥ó¥É¤â»ÈÍѤǤ­¤Þ¤¹¡£ ʸˡ¤Ï¡¢cdrom ¥Ö¥í¥Ã¥¯¤ò .sp -.RS 3n +.RS 4 .nf "/cdrom/"::Mount "foo"; .fi @@ -253,7 +253,7 @@ cdrom::Mount .RE .PP gpgv -.RS 3n +.RS 4 GPGV URI \- GPGV URI ÍѤÎÍ£°ì¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ gpgv ¤ËÅϤ¹Äɲåѥé¥á¡¼¥¿¤Î¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ gpgv::Options gpgv ¤ËÅϤ¹Äɲ媥ץ·¥ç¥ó¡£ @@ -272,7 +272,7 @@ Dir::State ¤Ë¤Ï¡¢ \fI/\fR ¤ä -\fI./\fR +\fI\&./\fR ¤Ç»Ï¤Þ¤é¤Ê¤¤ Á´¥µ¥Ö¥¢¥¤¥Æ¥à¤ËÉղ乤롢¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£ .PP Dir::Cache @@ -318,26 +318,26 @@ DSelect ¥»¥¯¥·¥ç¥ó°Ê²¼¤ÎÀßÄê¹àÌܤǡ¢ ¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤òÀ©¸æ¤·¤Þ¤¹¡£ .PP Clean -.RS 3n +.RS 4 ¥­¥ã¥Ã¥·¥å¥¯¥ê¡¼¥ó¥â¡¼¥É \- ¤³¤ÎÃÍ¤Ï always, prompt, auto, pre\-auto, never ¤Î¤¦¤Á¤Ò¤È¤Ä¤ò¼è¤ê¤Þ¤¹¡£ always ¤È prompt ¤Ï¹¹¿·¸å¡¢Á´¥Ñ¥Ã¥±¡¼¥¸¤ò¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤·¤Þ¤¹¡£ (¥Ç¥Õ¥©¥ë¥È¤Î) prompt ¤Ç¤Ï¾ò·ïÉÕ¤­¤Çºï½ü¤·¤Þ¤¹¡£ auto ¤Ï¥À¥¦¥ó¥í¡¼¥ÉÉÔǽ¥Ñ¥Ã¥±¡¼¥¸ (Î㤨¤Ð¿·¥Ð¡¼¥¸¥ç¥ó¤ÇÃÖ¤­´¹¤¨¤é¤ì¤¿¤â¤Î) ¤òºï½ü¤·¤Þ¤¹¡£pre\-auto ¤Ï¤³¤ÎÆ°ºî¤ò¡¢ ¿·¥Ñ¥Ã¥±¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëľÁ°¤Ë¹Ô¤¤¤Þ¤¹¡£ .RE .PP options -.RS 3n +.RS 4 ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢ install »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍÍ¤Ë -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP Updateoptions -.RS 3n +.RS 4 ¤³¤ÎÊÑ¿ô¤ÎÆâÍƤϡ¢ update »þ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ÈƱÍÍ¤Ë -\fBapt\-get\fR(8) +\fBapt-get\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP PromptAfterUpdate -.RS 3n +.RS 4 true ¤Î¾ì¹ç¡¢ \fBdselect\fR(8) ¤Î [U]pdate ¼Â¹Ô»þ¤Ë¡¢Â³¹Ô¤Î¤¿¤á¤Î¥×¥í¥ó¥×¥È¤òËè²óɽ¼¨¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¤Î¤ß¤Ç¤¹¡£ @@ -351,14 +351,14 @@ DPkg ¥»¥¯¥·¥ç¥ó¤Ë¤¢¤ê¤Þ¤¹¡£ .PP options -.RS 3n +.RS 4 dpkg ¤ËÅϤ¹¥ª¥×¥·¥ç¥ó¤Î¥ê¥¹¥È¤Ç¤¹¡£ ¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ê¥¹¥Èµ­Ë¡¤ò»ÈÍѤ·¤Æ»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ ¤Þ¤¿¡¢³Æ¥ê¥¹¥È¤Ïñ°ì¤Î°ú¿ô¤È¤·¤Æ \fBdpkg\fR(8) ¤ËÅϤµ¤ì¤Þ¤¹¡£ .RE .PP Pre\-Invoke, Post\-Invoke -.RS 3n +.RS 4 \fBdpkg\fR(8) ¤ò¸Æ¤Ó½Ð¤¹Á°¸å¤Ç¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£ options @@ -368,13 +368,13 @@ options .RE .PP Pre\-Install\-Pkgs -.RS 3n +.RS 4 \fBdpkg\fR(8) ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¼Â¹Ô¤¹¤ë¥·¥§¥ë¥³¥Þ¥ó¥É¤Î¥ê¥¹¥È¤Ç¤¹¡£ options ¤Î¤è¤¦¤Ë¥ê¥¹¥Èµ­Ë¡¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ ¥³¥Þ¥ó¥É¤Ï \fI/bin/sh\fR -¤òÄ̤·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢ ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£ APT ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ëÁ´ .deb ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò¡¢ ¤Ò¤È¤Ä¤º¤Ä¥³¥Þ¥ó¥É¤Îɸ½àÆþÎϤËÁ÷¤ê¤Þ¤¹¡£ +¤òÄ̤·¤Æ¸Æ¤Ó½Ð¤µ¤ì¡¢ ²¿¤«ÌäÂ꤬¤¢¤ì¤Ð¡¢APT ¤Ï°Û¾ï½ªÎ»¤·¤Þ¤¹¡£ APT ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤¹¤ëÁ´ \&.deb ¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾¤ò¡¢ ¤Ò¤È¤Ä¤º¤Ä¥³¥Þ¥ó¥É¤Îɸ½àÆþÎϤËÁ÷¤ê¤Þ¤¹¡£ .sp ¤³¤Î¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2 ¤Ç¤Ï¡¢(¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¤ä APT ÀßÄꥹ¥Ú¡¼¥¹¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò´Þ¤à) ¾ÜºÙ¾ðÊó¤ä¥Õ¥¡¥¤¥ë¡¢ Êѹ¹¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤ·¤Þ¤¹¡£ DPkg::Tools::options::cmd::Version @@ -386,16 +386,16 @@ Pre\-Install\-Pkgs .RE .PP Run\-Directory -.RS 3n +.RS 4 APT ¤Ï dpkg ¤ò¸Æ¤Ó½Ð¤¹Á°¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ï \fI/\fR ¤Ç¤¹¡£ .RE .PP Build\-options -.RS 3n +.RS 4 ¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë -\fBdpkg\-buildpackage\fR(1) +\fBdpkg-buildpackage\fR(1) ¤ËÅϤµ¤ì¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢½ð̾¤ò̵¸ú¤Ë¤·¡¢Á´¥Ð¥¤¥Ê¥ê¤òÀ¸À®¤·¤Þ¤¹¡£ .RE .SH "¥Ç¥Ð¥Ã¥°¥ª¥×¥·¥ç¥ó" @@ -412,41 +412,43 @@ Debug::Acquire::gpgv gpgv Ë¡¤Î¥Ç¥Ð¥Ã¥°¤Ç¤¹¡£ .SH "Îã" .PP -\fI/usr/share/doc/apt/examples/configure\-index.gz\fR +\fI/usr/share/doc/apt/examples/configure\-index\&.gz\fR ¤Ë¡¢Á´ÍøÍѲÄǽ¥ª¥×¥·¥ç¥ó¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»²¾È¤Ç¤­¤ë¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤¬¤¢¤ê¤Þ¤¹¡£ .SH "¥Õ¥¡¥¤¥ë" .PP -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8), -\fBapt\-config\fR(8), -\fBapt_preferences\fR(5). +\fBapt-cache\fR(8), +\fBapt-config\fR(8), +\fBapt_preferences\fR(5)\&. .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index 3fa931a..1d1c36b 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -56,8 +56,8 @@ " > - - apt-archive + + apt-ftparchive 1 " > @@ -296,7 +296,7 @@ diff --git a/doc/ja/apt_preferences.5 b/doc/ja/apt_preferences.5 index 419479c..ccba699 100644 --- a/doc/ja/apt_preferences.5 +++ b/doc/ja/apt_preferences.5 @@ -1,6 +1,6 @@ .\" Title: apt_preferences .\" Author: APT team -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -34,10 +34,10 @@ testing .PP ÀßÄê¥Õ¥¡¥¤¥ë¤¬¤Ê¤«¤Ã¤¿¤ê¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¡¢ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò³ä¤êÅö¤Æ¤ë¥¨¥ó¥È¥ê¤¬¤Ê¤¤¾ì¹ç¡¢ ¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅ٤ϡ¢ ¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Â°¤·¤Æ¤¤¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÍ¥ÀèÅ٤Ȥʤê¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤è¤ê¹â¤¤Í¥ÀèÅÙ¤ò»ý¤Ä¡¢ ÆÃÄê¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¡Ö¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¡×¤È¤·¤Æ¤ª¤¯¤Î¤Ï²Äǽ¤Ç¤¹¡£ ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ï¡¢\fBapt\-get\fR ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÀßÄꤷ¤¿¤ê¡¢ APT ÀßÄê¥Õ¥¡¥¤¥ë -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR ¤ÇÀßÄꤷ¤¿¤ê¤Ç¤­¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf \fBapt\-get install \-t testing \fR\fB\fIsome\-package\fR\fR .fi @@ -45,47 +45,50 @@ testing .sp .sp -.RS 3n +.RS 4 .nf APT::Default\-Release "stable"; .fi .RE -.sp .PP ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤¬»ØÄꤵ¤ì¤ë¤È¡¢APT ¤Ï°Ê²¼¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤òÀßÄꤷ¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë³ä¤êÅö¤Æ¤Þ¤¹¡£ .PP Í¥ÀèÅÙ 100 -.RS 3n +.RS 4 (¤¢¤ë¤Ê¤é¤Ð) ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP Í¥ÀèÅÙ 500 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¡¢¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP Í¥ÀèÅÙ 990 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¡¢¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤ë¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢ APT ¤Ïñ½ã¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï 100 ¤ò¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï 500 ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .PP APT ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤ò·èÄꤹ¤ë¤¿¤á¤Ë¡¢ °Ê²¼¤Î¥ë¡¼¥ë¤ò¾å¤«¤é½çÈÖ¤ËŬÍѤ·¤Þ¤¹¡£ -.TP 3n -\(bu -Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¾ì¹ç¡¢ ·è¤·¤Æ¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Þ¤»¤ó¡£ (¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤Ï¡¢¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤â¡¢ ¾®¤µ¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ APT ¤Î¥Ç¥Õ¥©¥ë¥ÈÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¤è¤¦¤ÊÍ¥ÀèÅÙ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤Î¤ßÀßÄê¤Ç¤­¤Þ¤¹¡£ ¤Þ¤¿¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥°¥ì¡¼¥É¤Ï´í¸±¤Ç¤¢¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤) -.TP 3n -\(bu -ºÇ¤â¹â¤¤Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Ʊ¤¸Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤¬Ê£¿ô¸ºß¤¹¤ë¾ì¹ç¡¢ ºÇ¤â¿·¤·¤¤¤â¤Î (ºÇ¤â¥Ð¡¼¥¸¥ç¥óÈֹ椬¹â¤¤¤â¤Î) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Í¥ÀèÅÙ¡¦¥Ð¡¼¥¸¥ç¥óÈֹ椬Ʊ¤¸¤â¤Î¤¬Ê£¿ô¸ºß¤·¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥¿¥Ç¡¼¥¿¤¬°Û¤Ê¤ë¤« +.sp +.RS 4 +\h'-04'\(bu\h'+03'Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¾ì¹ç¡¢ ·è¤·¤Æ¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Þ¤»¤ó¡£ (¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤Ï¡¢¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤â¡¢ ¾®¤µ¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ APT ¤Î¥Ç¥Õ¥©¥ë¥ÈÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¤è¤¦¤ÊÍ¥ÀèÅÙ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤Î¤ßÀßÄê¤Ç¤­¤Þ¤¹¡£ ¤Þ¤¿¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥°¥ì¡¼¥É¤Ï´í¸±¤Ç¤¢¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤) +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ºÇ¤â¹â¤¤Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ʊ¤¸Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤¬Ê£¿ô¸ºß¤¹¤ë¾ì¹ç¡¢ ºÇ¤â¿·¤·¤¤¤â¤Î (ºÇ¤â¥Ð¡¼¥¸¥ç¥óÈֹ椬¹â¤¤¤â¤Î) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Í¥ÀèÅÙ¡¦¥Ð¡¼¥¸¥ç¥óÈֹ椬Ʊ¤¸¤â¤Î¤¬Ê£¿ô¸ºß¤·¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥¿¥Ç¡¼¥¿¤¬°Û¤Ê¤ë¤« \-\-reinstall ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE .sp .RE .PP @@ -112,27 +115,28 @@ APT .SS "APT ÀßÄê¤Î¸ú²Ì" .PP APT ÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤¦¤È¡¢ ¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬Í¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¶õÇò¹Ô¤Ç¶èÀÚ¤é¤ì¤¿¡¢Ê£¿ô¹Ô¤«¤é¤Ê¤ë¥ì¥³¡¼¥É¤Ç¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥ì¥³¡¼¥É¤ÏÆÃÄê·Á¼°¤«¡¢ÈÆÍÑ·Á¼°¤Î¤É¤Á¤é¤«¤Î·Á¼°¤ò¤È¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -ÆÃÄê·Á¼°¤Ï¡¢Í¥ÀèÅÙ ("Pin\-Priority") ¤ò¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó (ÈÏ°Ï) ¤Ë¤Ä¤¤¤Æ³ä¤êÅö¤Æ¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢ "5.8" ¤Ç»Ï¤Þ¤ë +.sp +.RS 4 +\h'-04'\(bu\h'+03'ÆÃÄê·Á¼°¤Ï¡¢Í¥ÀèÅÙ ("Pin\-Priority") ¤ò¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó (ÈÏ°Ï) ¤Ë¤Ä¤¤¤Æ³ä¤êÅö¤Æ¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢ "5\&.8" ¤Ç»Ï¤Þ¤ë \fIperl\fR ¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¹â¤¤Í¥ÀèÅÙ¤ËÀßÄꤷ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 .fi .RE -.TP 3n -\(bu -ÈÆÍÑ·Á¼°¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤¢¤ë¡¢ ¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸ (\fIRelease\fR +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ÈÆÍÑ·Á¼°¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤¢¤ë¡¢ ¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸ (\fIRelease\fR ¥Õ¥¡¥¤¥ë¤ËÎóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸) ¤ÎÍ¥ÀèÅ٤䡢FQDN¤Ç»ØÄꤷ¤¿¡¢ ÆÃÄê¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¥¤¥È¤«¤é¼èÆÀ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤ëÈÆÍÑ·Á¼°¤Î¥¨¥ó¥È¥ê¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥°¥ë¡¼¥×¤Ë¤Ä¤¤¤Æ¤Î¤ßŬÍѤµ¤ì¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥í¡¼¥«¥ë¥µ¥¤¥È¤Ë¤¢¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢ ¹â¤¤Í¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: origin "" @@ -148,7 +152,7 @@ Pin\-Priority: 999 .sp °Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "unstable" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤ÆÄ㤤ͥÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=unstable @@ -156,15 +160,16 @@ Pin\-Priority: 50 .fi .RE .sp -°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "stable" ¤Ç¡¢ ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥óÈֹ椬 "3.0" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤Æ¹â¤¤Í¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ +°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "stable" ¤Ç¡¢ ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥óÈֹ椬 "3\&.0" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤Æ¹â¤¤Í¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * -Pin: release a=stable, v=3.0 +Pin: release a=stable, v=3\&.0 Pin\-Priority: 500 .fi .RE +.RE .sp .RE .SS "APT ¤¬Í¥ÀèÅ٤˳ä¤ê¹þ¤àÊýË¡" @@ -173,32 +178,32 @@ Pin\-Priority: 500 APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç³ä¤êÅö¤Æ¤¿Í¥ÀèÅÙ (P) ¤Ï¡¢ÀµÉé¤ÎÀ°¿ô¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ ¤³¤ì¤Ï (¤ª¤ª¤¶¤Ã¤Ñ¤Ë¤¤¤¦¤È) °Ê²¼¤Î¤è¤¦¤Ë²ò¼á¤µ¤ì¤Þ¤¹¡£ .PP P > 1000 -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤¬¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Æ¤â¡¢¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 990 < P <=1000 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤³¤È¤ò½ü¤­¡¢ ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤Ê¤¯¤Æ¤â¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 500 < P <=990 -.RS 3n +.RS 4 ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤Ã¤¿¤ê¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 100 < P <=500 -.RS 3n +.RS 4 ¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤Ã¤¿¤ê¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 0 < P <=100 -.RS 3n +.RS 4 ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP P < 0 -.RS 3n +.RS 4 ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ .RE .PP @@ -206,10 +211,10 @@ P < 0 .PP Î㤨¤Ð¡¢APT ÀßÄê¥Õ¥¡¥¤¥ë¤Î¾å¤ÎÊý¤Ë¡¢ °Ê²¼¤Î¥ì¥³¡¼¥É¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤È²¾Äꤷ¤Æ¤¯¤À¤µ¤¤¡£ .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 Package: * @@ -221,28 +226,30 @@ Pin: release unstable Pin\-Priority: 50 .fi .RE -.sp .PP ¤¹¤ë¤È¡¢ -.TP 3n -\(bu -¥Ð¡¼¥¸¥ç¥óÈֹ椬 "5.8" ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ì¤Ð¡¢ +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Ð¡¼¥¸¥ç¥óÈֹ椬 "5\&.8" ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ì¤Ð¡¢ perl -¤ÎºÇ¿·¤ÎÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 5.8* ¤¬ÍøÍѲÄǽ¤Ç¡¢¥Ð¡¼¥¸¥ç¥ó 5.9* ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ +¤ÎºÇ¿·¤ÎÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 5\&.8* ¤¬ÍøÍѲÄǽ¤Ç¡¢¥Ð¡¼¥¸¥ç¥ó 5\&.9* ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ perl ¤Ï¥À¥¦¥ó¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹¡£ -.TP 3n -\(bu -¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤ÇÍ­¸ú¤Ê¡¢ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤ÇÍ­¸ú¤Ê¡¢ perl °Ê³°¤Î¤É¤ó¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Ç¤â¡¢ ¾¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê (¤¿¤È¤¨¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë°¤·¤Æ¤¤¤Æ¤â) Í¥ÀèÅÙ¤¬¹â¤¯¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Ë¤Ï¤Ê¤¯¤Æ¤â +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Ë¤Ï¤Ê¤¯¤Æ¤â \fBsources.list\fR(5) ¤ËÎóµó¤µ¤ì¤¿¥µ¥¤¥È¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Ç¡¢ unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦ÁªÂò¤µ¤ì¡¢ ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤Ê¤¤¾ì¹ç¤Ë¤Î¤ß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ +.RE .sp .RE .SS "¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤È¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¥×¥í¥Ñ¥Æ¥£¤Î·èÄê" @@ -256,26 +263,26 @@ unstable .PP \fIPackages\fR ¥Õ¥¡¥¤¥ë¤ÏÄ̾ï -\fI.../dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR -¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£ Î㤨¤Ð¡¢\fI.../dists/stable/main/binary\-i386/Packages\fR +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR +¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£ Î㤨¤Ð¡¢\fI\&.\&.\&./dists/stable/main/binary\-i386/Packages\fR ¤Ç¤¹¡£ ¤³¤ì¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë¡¢ Ê£¿ô¹Ô¤Î¥ì¥³¡¼¥É¤«¤é¤Ç¤­¤Æ¤¤¤Þ¤¹¡£ APT Í¥ÀèÅÙ¤ÎÀßÄê¤Ï¡¢¥ì¥³¡¼¥É¤´¤È¤Ë°Ê²¼¤Î 2 ¹Ô¤À¤±¤Ç¤¹¡£ .PP Package: ¹Ô -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÍ¿¤¨¤Þ¤¹¡£ .RE .PP Version: ¹Ô -.RS 3n +.RS 4 ¤½¤Î̾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÍ¿¤¨¤Þ¤¹¡£ .RE .PP \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Ï¡¢Ä̾ï -\fI.../dists/\fR\fI\fIdist\-name\fR\fR +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR ¤Ë¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢ -\fI.../dists/stable/Release\fR, -\fI.../dists/woody/Release\fR +\fI\&.\&.\&./dists/stable/Release\fR, +\fI\&.\&.\&./dists/woody/Release\fR ¤Ç¤¹¡£ ¤³¤ì¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤¢¤ë\fIÁ´\fR¥Ñ¥Ã¥±¡¼¥¸¤ËŬÍѤ¹¤ë¡¢ Ê£¿ô¹Ô¤Î¥ì¥³¡¼¥É 1 ¤Ä¤«¤éÀ®¤Ã¤Æ¤¤¤Þ¤¹¡£ \fIPackages\fR ¤È°ã¤¤ @@ -283,13 +290,13 @@ Version: ¥Õ¥¡¥¤¥ë¤Ï¡¢ ¤Û¤È¤ó¤É¤Î¹Ô¤¬ APT Í¥ÀèÅÙ¤ÎÀßÄê¤Ë´ØÏ¢¤·¤Þ¤¹¡£ .PP Archive: ¹Ô -.RS 3n +.RS 4 ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë°¤¹¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Î¥¢¡¼¥«¥¤¥Ö̾¡£ Î㤨¤Ð¡¢ "Archive: stable" ¤È¤¤¤¦¹Ô¤Ï¡¢\fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼°Ê²¼¤Ë¤¢¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ stable ¥¢¡¼¥«¥¤¥Ö¤À¤È»ØÄꤷ¤Þ¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ÎÃͤò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release a=stable .fi @@ -297,30 +304,30 @@ Pin: release a=stable .RE .PP Version: ¹Ô -.RS 3n -¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó̾¡£ Î㤨¤Ð¡¢¤³¤Î¥Ä¥ê¡¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ GNU/Linux ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó 3.0 ¤Ë°¤¹¤ë¤È¤·¤Þ¤¹¡£ Ä̾ï +.RS 4 +¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó̾¡£ Î㤨¤Ð¡¢¤³¤Î¥Ä¥ê¡¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ GNU/Linux ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó 3\&.0 ¤Ë°¤¹¤ë¤È¤·¤Þ¤¹¡£ Ä̾ï testing ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ä unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤Ï¡¢ ¤Þ¤À¥ê¥ê¡¼¥¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¥Ð¡¼¥¸¥ç¥óÈֹ椬ÉÕ¤­¤Þ¤»¤ó¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ì¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤Î¤¤¤º¤ì¤«¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 +Pin: release v=3\&.0 +Pin: release a=stable, v=3\&.0 +Pin: release 3\&.0 .fi .RE .RE .PP Component: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥é¥¤¥»¥ó¥¹¥³¥ó¥Ý¡¼¥Í¥ó¥È̾¡£ Î㤨¤Ð¡¢"Component: main" ¤È¤¤¤¦¹Ô¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¥Õ¥¡¥¤¥ë¤¬¡¢ main ¥³¥ó¥Ý¡¼¥Í¥ó¥È (Debian ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥¬¥¤¥É¥é¥¤¥ó¤Î¸µ¤Ç¥é¥¤¥»¥ó¥¹¤µ¤ì¤Æ¤¤¤ë) ¤Ç¤¢¤ë¤³¤È¤òɽ¤·¤Þ¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release c=main .fi @@ -328,12 +335,12 @@ Pin: release c=main .RE .PP Origin: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÄ󶡼Ô̾¡£ ¤Û¤È¤ó¤É¶¦Ä̤ǡ¢Debian ¤Ç¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ÎÄ󶡼Ԥò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release o=Debian .fi @@ -341,13 +348,13 @@ Pin: release o=Debian .RE .PP Label: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥é¥Ù¥ë̾¡£ ¤Û¤È¤ó¤É¶¦ÄÌ¤Ç Debian ¤Ç¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤Î¥é¥Ù¥ë¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release l=Debian .fi @@ -362,13 +369,13 @@ Pin: release l=Debian ¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ¡¢ \fI/var/lib/apt/lists\fR ¥Ç¥£¥ì¥¯¥È¥ê¤ä¡¢ -\fIapt.conf\fR +\fIapt\&.conf\fR ¥Õ¥¡¥¤¥ë¤Î Dir::State::Lists ÊÑ¿ô¤Ç»ØÄꤷ¤¿¾ì½ê¤Ë¼èÆÀ¤µ¤ì¤Þ¤¹¡£Î㤨¤Ð¡¢ -\fIdebian.lcs.mit.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR +\fIdebian\&.lcs\&.mit\&.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR ¥Õ¥¡¥¤¥ë¤Ï¡¢ -debian.lcs.mit.edu +debian\&.lcs\&.mit\&.edu ¤«¤é¼èÆÀ¤·¤¿¡¢ unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç¡¢ @@ -386,7 +393,7 @@ Explanation: .PP APT ÀßÄê¥ì¥³¡¼¥É¤Î Pin\-Priority: -¹Ô¤ÏǤ°Õ¤Ç¤¹¡£ ¾Êά¤¹¤ë¤È¡¢Pin\-Priority: release ... +¹Ô¤ÏǤ°Õ¤Ç¤¹¡£ ¾Êά¤¹¤ë¤È¡¢Pin\-Priority: release \&.\&.\&. ¤Ç»Ï¤Þ¤ë¹Ô¤Ç»Ø¼¨¤·¤¿ºÇ¸å¤ÎÃÍ (¾¯¤Ê¤¯¤È¤â1¤Ä) ¤òÍ¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .SH "¥µ¥ó¥×¥ë" .SS "°ÂÄêÈǤòÄÉÀ×" @@ -396,7 +403,7 @@ Pin\-Priority: Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¡¢ Ä㤯¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¤è¤¦¤ÊÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Explanation: Uninstall or do not install any Debian\-originated Explanation: package versions other than those in the stable distro @@ -409,7 +416,6 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP ŬÀÚ¤Ê \fBsources.list\fR(5) @@ -417,20 +423,19 @@ Pin\-Priority: \-10 stable ¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\-name\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò testing ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ºÆÅÙ¤³¤Î¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤Ê¤¤¤È¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\fR/testing .fi @@ -445,7 +450,7 @@ unstable Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¡¢ Ä㤯¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¤è¤¦¤ÊÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=testing @@ -460,7 +465,6 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP ŬÀÚ¤Ê \fBsources.list\fR(5) @@ -468,14 +472,13 @@ Pin\-Priority: \-10 testing ¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\-name\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò unstable @@ -489,7 +492,7 @@ unstable ¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¹¹¿·¤µ¤ì¤Æ¤¤¤ì¤Ð unstable¤ÎºÇ¿·ÈǤ˥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\fR/unstable .fi @@ -497,30 +500,32 @@ apt\-get install \fIpackage\fR/unstable .sp .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-get\fR(8) -\fBapt\-cache\fR(8) +\fBapt-get\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) \fBsources.list\fR(5) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/apt_preferences.ja.5 b/doc/ja/apt_preferences.ja.5 index 419479c..ccba699 100644 --- a/doc/ja/apt_preferences.ja.5 +++ b/doc/ja/apt_preferences.ja.5 @@ -1,6 +1,6 @@ .\" Title: apt_preferences .\" Author: APT team -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux @@ -34,10 +34,10 @@ testing .PP ÀßÄê¥Õ¥¡¥¤¥ë¤¬¤Ê¤«¤Ã¤¿¤ê¡¢ ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¡¢ÆÃÄê¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò³ä¤êÅö¤Æ¤ë¥¨¥ó¥È¥ê¤¬¤Ê¤¤¾ì¹ç¡¢ ¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅ٤ϡ¢ ¤½¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Â°¤·¤Æ¤¤¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÍ¥ÀèÅ٤Ȥʤê¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤è¤ê¹â¤¤Í¥ÀèÅÙ¤ò»ý¤Ä¡¢ ÆÃÄê¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò¡Ö¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¡×¤È¤·¤Æ¤ª¤¯¤Î¤Ï²Äǽ¤Ç¤¹¡£ ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ï¡¢\fBapt\-get\fR ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÀßÄꤷ¤¿¤ê¡¢ APT ÀßÄê¥Õ¥¡¥¤¥ë -\fI/etc/apt/apt.conf\fR +\fI/etc/apt/apt\&.conf\fR ¤ÇÀßÄꤷ¤¿¤ê¤Ç¤­¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf \fBapt\-get install \-t testing \fR\fB\fIsome\-package\fR\fR .fi @@ -45,47 +45,50 @@ testing .sp .sp -.RS 3n +.RS 4 .nf APT::Default\-Release "stable"; .fi .RE -.sp .PP ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤¬»ØÄꤵ¤ì¤ë¤È¡¢APT ¤Ï°Ê²¼¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤òÀßÄꤷ¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë³ä¤êÅö¤Æ¤Þ¤¹¡£ .PP Í¥ÀèÅÙ 100 -.RS 3n +.RS 4 (¤¢¤ë¤Ê¤é¤Ð) ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP Í¥ÀèÅÙ 500 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¡¢¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP Í¥ÀèÅÙ 990 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤ª¤é¤º¡¢¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤ë¥Ð¡¼¥¸¥ç¥ó¡£ .RE .PP ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢ APT ¤Ïñ½ã¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï 100 ¤ò¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï 500 ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .PP APT ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤ò·èÄꤹ¤ë¤¿¤á¤Ë¡¢ °Ê²¼¤Î¥ë¡¼¥ë¤ò¾å¤«¤é½çÈÖ¤ËŬÍѤ·¤Þ¤¹¡£ -.TP 3n -\(bu -Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¾ì¹ç¡¢ ·è¤·¤Æ¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Þ¤»¤ó¡£ (¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤Ï¡¢¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤â¡¢ ¾®¤µ¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ APT ¤Î¥Ç¥Õ¥©¥ë¥ÈÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¤è¤¦¤ÊÍ¥ÀèÅÙ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤Î¤ßÀßÄê¤Ç¤­¤Þ¤¹¡£ ¤Þ¤¿¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥°¥ì¡¼¥É¤Ï´í¸±¤Ç¤¢¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤) -.TP 3n -\(bu -ºÇ¤â¹â¤¤Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Ʊ¤¸Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤¬Ê£¿ô¸ºß¤¹¤ë¾ì¹ç¡¢ ºÇ¤â¿·¤·¤¤¤â¤Î (ºÇ¤â¥Ð¡¼¥¸¥ç¥óÈֹ椬¹â¤¤¤â¤Î) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ -.TP 3n -\(bu -Í¥ÀèÅÙ¡¦¥Ð¡¼¥¸¥ç¥óÈֹ椬Ʊ¤¸¤â¤Î¤¬Ê£¿ô¸ºß¤·¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥¿¥Ç¡¼¥¿¤¬°Û¤Ê¤ë¤« +.sp +.RS 4 +\h'-04'\(bu\h'+03'Í­¸ú¤Ê¥Ð¡¼¥¸¥ç¥ó¤ÎÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¾ì¹ç¡¢ ·è¤·¤Æ¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Þ¤»¤ó¡£ (¡Ö¥À¥¦¥ó¥°¥ì¡¼¥É¡×¤Ï¡¢¸½ºß¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê¤â¡¢ ¾®¤µ¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ APT ¤Î¥Ç¥Õ¥©¥ë¥ÈÍ¥ÀèÅÙ¤¬ 1000 ¤ò±Û¤¨¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤½¤Î¤è¤¦¤ÊÍ¥ÀèÅÙ¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤Î¤ßÀßÄê¤Ç¤­¤Þ¤¹¡£ ¤Þ¤¿¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥°¥ì¡¼¥É¤Ï´í¸±¤Ç¤¢¤ë¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤) +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ºÇ¤â¹â¤¤Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Ʊ¤¸Í¥ÀèÅ٤ΥС¼¥¸¥ç¥ó¤¬Ê£¿ô¸ºß¤¹¤ë¾ì¹ç¡¢ ºÇ¤â¿·¤·¤¤¤â¤Î (ºÇ¤â¥Ð¡¼¥¸¥ç¥óÈֹ椬¹â¤¤¤â¤Î) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'Í¥ÀèÅÙ¡¦¥Ð¡¼¥¸¥ç¥óÈֹ椬Ʊ¤¸¤â¤Î¤¬Ê£¿ô¸ºß¤·¡¢ ¤½¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥á¥¿¥Ç¡¼¥¿¤¬°Û¤Ê¤ë¤« \-\-reinstall ¥ª¥×¥·¥ç¥ó¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤â¤Î¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ +.RE .sp .RE .PP @@ -112,27 +115,28 @@ APT .SS "APT ÀßÄê¤Î¸ú²Ì" .PP APT ÀßÄê¥Õ¥¡¥¤¥ë¤ò»È¤¦¤È¡¢ ¥·¥¹¥Æ¥à´ÉÍý¼Ô¤¬Í¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¶õÇò¹Ô¤Ç¶èÀÚ¤é¤ì¤¿¡¢Ê£¿ô¹Ô¤«¤é¤Ê¤ë¥ì¥³¡¼¥É¤Ç¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥ì¥³¡¼¥É¤ÏÆÃÄê·Á¼°¤«¡¢ÈÆÍÑ·Á¼°¤Î¤É¤Á¤é¤«¤Î·Á¼°¤ò¤È¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -ÆÃÄê·Á¼°¤Ï¡¢Í¥ÀèÅÙ ("Pin\-Priority") ¤ò¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó (ÈÏ°Ï) ¤Ë¤Ä¤¤¤Æ³ä¤êÅö¤Æ¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢ "5.8" ¤Ç»Ï¤Þ¤ë +.sp +.RS 4 +\h'-04'\(bu\h'+03'ÆÃÄê·Á¼°¤Ï¡¢Í¥ÀèÅÙ ("Pin\-Priority") ¤ò¡¢ »ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄꤷ¤¿¥Ð¡¼¥¸¥ç¥ó (ÈÏ°Ï) ¤Ë¤Ä¤¤¤Æ³ä¤êÅö¤Æ¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢ "5\&.8" ¤Ç»Ï¤Þ¤ë \fIperl\fR ¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¹â¤¤Í¥ÀèÅÙ¤ËÀßÄꤷ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 .fi .RE -.TP 3n -\(bu -ÈÆÍÑ·Á¼°¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤¢¤ë¡¢ ¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸ (\fIRelease\fR +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'ÈÆÍÑ·Á¼°¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤¢¤ë¡¢ ¤¹¤Ù¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸ (\fIRelease\fR ¥Õ¥¡¥¤¥ë¤ËÎóµó¤·¤¿¥Ñ¥Ã¥±¡¼¥¸) ¤ÎÍ¥ÀèÅ٤䡢FQDN¤Ç»ØÄꤷ¤¿¡¢ ÆÃÄê¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¥¤¥È¤«¤é¼èÆÀ¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤ëÈÆÍÑ·Á¼°¤Î¥¨¥ó¥È¥ê¤Ï¡¢ ¥Ñ¥Ã¥±¡¼¥¸¤Î¥°¥ë¡¼¥×¤Ë¤Ä¤¤¤Æ¤Î¤ßŬÍѤµ¤ì¤Þ¤¹¡£ Î㤨¤Ð°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥í¡¼¥«¥ë¥µ¥¤¥È¤Ë¤¢¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ¡¢ ¹â¤¤Í¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: origin "" @@ -148,7 +152,7 @@ Pin\-Priority: 999 .sp °Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "unstable" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤ÆÄ㤤ͥÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=unstable @@ -156,15 +160,16 @@ Pin\-Priority: 50 .fi .RE .sp -°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "stable" ¤Ç¡¢ ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥óÈֹ椬 "3.0" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤Æ¹â¤¤Í¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ +°Ê²¼¤Î¥ì¥³¡¼¥É¤Ï¡¢¥¢¡¼¥«¥¤¥Ö̾¤¬ "stable" ¤Ç¡¢ ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥óÈֹ椬 "3\&.0" ¤È¤Ê¤Ã¤Æ¤¤¤ë¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¡¢ ¤¹¤Ù¤Æ¹â¤¤Í¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * -Pin: release a=stable, v=3.0 +Pin: release a=stable, v=3\&.0 Pin\-Priority: 500 .fi .RE +.RE .sp .RE .SS "APT ¤¬Í¥ÀèÅ٤˳ä¤ê¹þ¤àÊýË¡" @@ -173,32 +178,32 @@ Pin\-Priority: 500 APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç³ä¤êÅö¤Æ¤¿Í¥ÀèÅÙ (P) ¤Ï¡¢ÀµÉé¤ÎÀ°¿ô¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£ ¤³¤ì¤Ï (¤ª¤ª¤¶¤Ã¤Ñ¤Ë¤¤¤¦¤È) °Ê²¼¤Î¤è¤¦¤Ë²ò¼á¤µ¤ì¤Þ¤¹¡£ .PP P > 1000 -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸¤¬¥À¥¦¥ó¥°¥ì¡¼¥É¤·¤Æ¤â¡¢¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 990 < P <=1000 -.RS 3n +.RS 4 ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤³¤È¤ò½ü¤­¡¢ ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë´Þ¤Þ¤ì¤Ê¤¯¤Æ¤â¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 500 < P <=990 -.RS 3n +.RS 4 ¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë°¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤Ã¤¿¤ê¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 100 < P <=500 -.RS 3n +.RS 4 ¾¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤¹¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤Ã¤¿¤ê¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤ÎÊý¤¬¿·¤·¤¤¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP 0 < P <=100 -.RS 3n +.RS 4 ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ .RE .PP P < 0 -.RS 3n +.RS 4 ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£ .RE .PP @@ -206,10 +211,10 @@ P < 0 .PP Î㤨¤Ð¡¢APT ÀßÄê¥Õ¥¡¥¤¥ë¤Î¾å¤ÎÊý¤Ë¡¢ °Ê²¼¤Î¥ì¥³¡¼¥É¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤È²¾Äꤷ¤Æ¤¯¤À¤µ¤¤¡£ .sp -.RS 3n +.RS 4 .nf Package: perl -Pin: version 5.8* +Pin: version 5\&.8* Pin\-Priority: 1001 Package: * @@ -221,28 +226,30 @@ Pin: release unstable Pin\-Priority: 50 .fi .RE -.sp .PP ¤¹¤ë¤È¡¢ -.TP 3n -\(bu -¥Ð¡¼¥¸¥ç¥óÈֹ椬 "5.8" ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ì¤Ð¡¢ +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥Ð¡¼¥¸¥ç¥óÈֹ椬 "5\&.8" ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ì¤Ð¡¢ perl -¤ÎºÇ¿·¤ÎÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 5.8* ¤¬ÍøÍѲÄǽ¤Ç¡¢¥Ð¡¼¥¸¥ç¥ó 5.9* ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ +¤ÎºÇ¿·¤ÎÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ ¥Ð¡¼¥¸¥ç¥ó 5\&.8* ¤¬ÍøÍѲÄǽ¤Ç¡¢¥Ð¡¼¥¸¥ç¥ó 5\&.9* ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ perl ¤Ï¥À¥¦¥ó¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹¡£ -.TP 3n -\(bu -¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤ÇÍ­¸ú¤Ê¡¢ +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤ÇÍ­¸ú¤Ê¡¢ perl °Ê³°¤Î¤É¤ó¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Ç¤â¡¢ ¾¤Î¥Ð¡¼¥¸¥ç¥ó¤è¤ê (¤¿¤È¤¨¥¿¡¼¥²¥Ã¥È¥ê¥ê¡¼¥¹¤Ë°¤·¤Æ¤¤¤Æ¤â) Í¥ÀèÅÙ¤¬¹â¤¯¤Ê¤ê¤Þ¤¹¡£ -.TP 3n -\(bu -¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Ë¤Ï¤Ê¤¯¤Æ¤â +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¤Ë¤Ï¤Ê¤¯¤Æ¤â \fBsources.list\fR(5) ¤ËÎóµó¤µ¤ì¤¿¥µ¥¤¥È¤Ë¤¢¤ë¥Ð¡¼¥¸¥ç¥ó¤Ç¡¢ unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë°¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤è¤¦ÁªÂò¤µ¤ì¡¢ ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤¬¤Ê¤¤¾ì¹ç¤Ë¤Î¤ß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£ +.RE .sp .RE .SS "¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤È¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¥×¥í¥Ñ¥Æ¥£¤Î·èÄê" @@ -256,26 +263,26 @@ unstable .PP \fIPackages\fR ¥Õ¥¡¥¤¥ë¤ÏÄ̾ï -\fI.../dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR -¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£ Î㤨¤Ð¡¢\fI.../dists/stable/main/binary\-i386/Packages\fR +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR\fI/\fR\fI\fIcomponent\fR\fR\fI/\fR\fI\fIarch\fR\fR +¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£ Î㤨¤Ð¡¢\fI\&.\&.\&./dists/stable/main/binary\-i386/Packages\fR ¤Ç¤¹¡£ ¤³¤ì¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÍøÍѲÄǽ¥Ñ¥Ã¥±¡¼¥¸¤´¤È¤Ë¡¢ Ê£¿ô¹Ô¤Î¥ì¥³¡¼¥É¤«¤é¤Ç¤­¤Æ¤¤¤Þ¤¹¡£ APT Í¥ÀèÅÙ¤ÎÀßÄê¤Ï¡¢¥ì¥³¡¼¥É¤´¤È¤Ë°Ê²¼¤Î 2 ¹Ô¤À¤±¤Ç¤¹¡£ .PP Package: ¹Ô -.RS 3n +.RS 4 ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òÍ¿¤¨¤Þ¤¹¡£ .RE .PP Version: ¹Ô -.RS 3n +.RS 4 ¤½¤Î̾Á°¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òÍ¿¤¨¤Þ¤¹¡£ .RE .PP \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Ï¡¢Ä̾ï -\fI.../dists/\fR\fI\fIdist\-name\fR\fR +\fI\&.\&.\&./dists/\fR\fI\fIdist\-name\fR\fR ¤Ë¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢ -\fI.../dists/stable/Release\fR, -\fI.../dists/woody/Release\fR +\fI\&.\&.\&./dists/stable/Release\fR, +\fI\&.\&.\&./dists/woody/Release\fR ¤Ç¤¹¡£ ¤³¤ì¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤¢¤ë\fIÁ´\fR¥Ñ¥Ã¥±¡¼¥¸¤ËŬÍѤ¹¤ë¡¢ Ê£¿ô¹Ô¤Î¥ì¥³¡¼¥É 1 ¤Ä¤«¤éÀ®¤Ã¤Æ¤¤¤Þ¤¹¡£ \fIPackages\fR ¤È°ã¤¤ @@ -283,13 +290,13 @@ Version: ¥Õ¥¡¥¤¥ë¤Ï¡¢ ¤Û¤È¤ó¤É¤Î¹Ô¤¬ APT Í¥ÀèÅÙ¤ÎÀßÄê¤Ë´ØÏ¢¤·¤Þ¤¹¡£ .PP Archive: ¹Ô -.RS 3n +.RS 4 ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë°¤¹¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤Î¥¢¡¼¥«¥¤¥Ö̾¡£ Î㤨¤Ð¡¢ "Archive: stable" ¤È¤¤¤¦¹Ô¤Ï¡¢\fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼°Ê²¼¤Ë¤¢¤ëÁ´¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ stable ¥¢¡¼¥«¥¤¥Ö¤À¤È»ØÄꤷ¤Þ¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ÎÃͤò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release a=stable .fi @@ -297,30 +304,30 @@ Pin: release a=stable .RE .PP Version: ¹Ô -.RS 3n -¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó̾¡£ Î㤨¤Ð¡¢¤³¤Î¥Ä¥ê¡¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ GNU/Linux ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó 3.0 ¤Ë°¤¹¤ë¤È¤·¤Þ¤¹¡£ Ä̾ï +.RS 4 +¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó̾¡£ Î㤨¤Ð¡¢¤³¤Î¥Ä¥ê¡¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¡¢ GNU/Linux ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó 3\&.0 ¤Ë°¤¹¤ë¤È¤·¤Þ¤¹¡£ Ä̾ï testing ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ä unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¤Ï¡¢ ¤Þ¤À¥ê¥ê¡¼¥¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¥Ð¡¼¥¸¥ç¥óÈֹ椬ÉÕ¤­¤Þ¤»¤ó¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ì¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤Î¤¤¤º¤ì¤«¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 +Pin: release v=3\&.0 +Pin: release a=stable, v=3\&.0 +Pin: release 3\&.0 .fi .RE .RE .PP Component: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¡¢ ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥é¥¤¥»¥ó¥¹¥³¥ó¥Ý¡¼¥Í¥ó¥È̾¡£ Î㤨¤Ð¡¢"Component: main" ¤È¤¤¤¦¹Ô¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¥Õ¥¡¥¤¥ë¤¬¡¢ main ¥³¥ó¥Ý¡¼¥Í¥ó¥È (Debian ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥¬¥¤¥É¥é¥¤¥ó¤Î¸µ¤Ç¥é¥¤¥»¥ó¥¹¤µ¤ì¤Æ¤¤¤ë) ¤Ç¤¢¤ë¤³¤È¤òɽ¤·¤Þ¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release c=main .fi @@ -328,12 +335,12 @@ Pin: release c=main .RE .PP Origin: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÄ󶡼Ô̾¡£ ¤Û¤È¤ó¤É¶¦Ä̤ǡ¢Debian ¤Ç¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤ÎÄ󶡼Ԥò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release o=Debian .fi @@ -341,13 +348,13 @@ Pin: release o=Debian .RE .PP Label: ¹Ô -.RS 3n +.RS 4 \fIRelease\fR ¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ë¤¢¤ë¥Ñ¥Ã¥±¡¼¥¸¤Î¥é¥Ù¥ë̾¡£ ¤Û¤È¤ó¤É¶¦ÄÌ¤Ç Debian ¤Ç¤¹¡£ APT ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤³¤Î¥é¥Ù¥ë¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¹Ô¤¬É¬Íפˤʤê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Pin: release l=Debian .fi @@ -362,13 +369,13 @@ Pin: release l=Debian ¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ¡¢ \fI/var/lib/apt/lists\fR ¥Ç¥£¥ì¥¯¥È¥ê¤ä¡¢ -\fIapt.conf\fR +\fIapt\&.conf\fR ¥Õ¥¡¥¤¥ë¤Î Dir::State::Lists ÊÑ¿ô¤Ç»ØÄꤷ¤¿¾ì½ê¤Ë¼èÆÀ¤µ¤ì¤Þ¤¹¡£Î㤨¤Ð¡¢ -\fIdebian.lcs.mit.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR +\fIdebian\&.lcs\&.mit\&.edu_debian_dists_unstable_contrib_binary\-i386_Release\fR ¥Õ¥¡¥¤¥ë¤Ï¡¢ -debian.lcs.mit.edu +debian\&.lcs\&.mit\&.edu ¤«¤é¼èÆÀ¤·¤¿¡¢ unstable ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç¡¢ @@ -386,7 +393,7 @@ Explanation: .PP APT ÀßÄê¥ì¥³¡¼¥É¤Î Pin\-Priority: -¹Ô¤ÏǤ°Õ¤Ç¤¹¡£ ¾Êά¤¹¤ë¤È¡¢Pin\-Priority: release ... +¹Ô¤ÏǤ°Õ¤Ç¤¹¡£ ¾Êά¤¹¤ë¤È¡¢Pin\-Priority: release \&.\&.\&. ¤Ç»Ï¤Þ¤ë¹Ô¤Ç»Ø¼¨¤·¤¿ºÇ¸å¤ÎÃÍ (¾¯¤Ê¤¯¤È¤â1¤Ä) ¤òÍ¥ÀèÅ٤˳ä¤êÅö¤Æ¤Þ¤¹¡£ .SH "¥µ¥ó¥×¥ë" .SS "°ÂÄêÈǤòÄÉÀ×" @@ -396,7 +403,7 @@ Pin\-Priority: Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¡¢ Ä㤯¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¤è¤¦¤ÊÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Explanation: Uninstall or do not install any Debian\-originated Explanation: package versions other than those in the stable distro @@ -409,7 +416,6 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP ŬÀÚ¤Ê \fBsources.list\fR(5) @@ -417,20 +423,19 @@ Pin\-Priority: \-10 stable ¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\-name\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò testing ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£ ¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ºÆÅÙ¤³¤Î¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤Ê¤¤¤È¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤»¤ó¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\fR/testing .fi @@ -445,7 +450,7 @@ unstable Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¡¢ Ä㤯¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¤è¤¦¤ÊÍ¥ÀèÅÙ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf Package: * Pin: release a=testing @@ -460,7 +465,6 @@ Pin: release o=Debian Pin\-Priority: \-10 .fi .RE -.sp .PP ŬÀÚ¤Ê \fBsources.list\fR(5) @@ -468,14 +472,13 @@ Pin\-Priority: \-10 testing ¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\-name\fR apt\-get upgrade apt\-get dist\-upgrade .fi .RE -.sp .PP °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢»ØÄꤷ¤¿¥Ñ¥Ã¥±¡¼¥¸¤ò unstable @@ -489,7 +492,7 @@ unstable ¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¹¹¿·¤µ¤ì¤Æ¤¤¤ì¤Ð unstable¤ÎºÇ¿·ÈǤ˥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf apt\-get install \fIpackage\fR/unstable .fi @@ -497,30 +500,32 @@ apt\-get install \fIpackage\fR/unstable .sp .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-get\fR(8) -\fBapt\-cache\fR(8) +\fBapt-get\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) \fBsources.list\fR(5) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHOR" .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/sources.list.5 b/doc/ja/sources.list.5 index cb41f93..796a034 100644 --- a/doc/ja/sources.list.5 +++ b/doc/ja/sources.list.5 @@ -1,11 +1,11 @@ .\" Title: sources.list .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "SOURCES.LIST" "5" "29 February 2004" "Linux" "" +.TH "SOURCES\&.LIST" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,7 @@ sources.list \- APT Íѥѥ屡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È .SH "ÀâÌÀ" .PP -¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÊݴɾì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£ º£²ó¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï¡¢ Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¤ßµ­½Ò¤·¤Þ¤¹¡£ ¤³¤ÎÀ©¸æ¥Õ¥¡¥¤¥ë¤Ï¡¢\fI/etc/apt/sources.list\fR +¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÊݴɾì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£ º£²ó¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï¡¢ Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¤ßµ­½Ò¤·¤Þ¤¹¡£ ¤³¤ÎÀ©¸æ¥Õ¥¡¥¤¥ë¤Ï¡¢\fI/etc/apt/sources\&.list\fR ¤Ë¤¢¤ê¤Þ¤¹¡£ .PP ¥½¡¼¥¹¥ê¥¹¥È¤ÏÊ£¿ô¤ÎÍ­¸ú¤Ê¼èÆÀ¸µ¤È¡¢ ÍÍ¡¹¤Ê¼èÆÀ¥á¥Ç¥£¥¢¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ë¤Ï 1 ¹Ô¤´¤È¼èÆÀ¸µ¤òÎóµó¤·¡¢¾å¤ÎÊý¤Ë¤¢¤ë¤â¤Î¤«¤é»ÈÍѤ·¤Þ¤¹¡£ ¹Ô¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢¥¿¥¤¥× uri °ú¿ô @@ -27,13 +27,13 @@ uri ¤Ï Universal Resource Identifier (URI) ¤Ç¡¢ ¤è¤¯ÃΤé¤ì¤¿ URL ¤Î¥¹¡¼¥Ñ¡¼¥»¥Ã¥È¤Ç¤¹¡£ ¹Ô¤Î»Ä¤ê¤Ë # ¤òÉÕ¤±¤Æ¡¢¥³¥á¥ó¥È¤Ë¤Ç¤­¤Þ¤¹¡£ .SH "SOURCES.LIST.D" .PP -\fI/etc/apt/sources.list.d\fR +\fI/etc/apt/sources\&.list\&.d\fR ¥Ç¥£¥ì¥¯¥È¥ê¤Ë ¥Õ¥¡¥¤¥ë̾¤¬ -.list -¤Ç½ª¤ï¤ë¸ÄÊÌ¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤¯¤È¡¢ sources.list ¥¨¥ó¥È¥ê¤ËÄɲäǤ­¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ Ä̾ï¤Î -\fIsources.list\fR +\&.list +¤Ç½ª¤ï¤ë¸ÄÊÌ¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤¯¤È¡¢ sources\&.list ¥¨¥ó¥È¥ê¤ËÄɲäǤ­¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ Ä̾ï¤Î +\fIsources\&.list\fR ¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¡£ -.SH "DEB ¥¿¥¤¥×¤È DEB\-SRC ¥¿¥¤¥×" +.SH "DEB ¥¿¥¤¥×¤È DEB-SRC ¥¿¥¤¥×" .PP deb ¥¿¥¤¥×¤Ç¤Ïŵ·¿Åª¤Ê 2 Ãʳ¬¤Î Debian ¥¢¡¼¥«¥¤¥Ö (\fIdistribution/component\fR) ¤òµ­½Ò¤·¤Þ¤¹¡£ ¤è¤¯¤¢¤ë¥±¡¼¥¹¤Ç¤Ï¡¢distribution @@ -57,15 +57,14 @@ deb ¥¿¥¤¥×¤È deb\-src ¥¿¥¤¥×¤Ç»ÈÍѤ¹¤ë -\fIsources.list\fR +\fIsources\&.list\fR ¥¨¥ó¥È¥ê¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢°Ê²¼¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb uri distribution [component1] [component2] [...] +deb uri distribution [component1] [component2] [\&.\&.\&.] .fi .RE -.sp .PP deb ¥¿¥¤¥×¤Î URI ¤Ï¡¢ APT ¤¬¾ðÊó¤ò¸«¤Ä¤±¤é¤ì¤ë¤è¤¦¤Ë¡¢ Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î´ðÄì¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ @@ -82,8 +81,8 @@ distribution $(ARCH) ÊÑ¿ô¤ò´Þ¤à¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£ $(ARCH) -ÊÑ¿ô¤Ï¡¢¥·¥¹¥Æ¥à¤Ç»ÈÍѤ·¤Æ¤¤¤ë Debian ¥¢¡¼¥­¥Æ¥¯¥Á¥ã (i386, m68k, powerpc, ...) ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤ -\fIsources.list\fR +ÊÑ¿ô¤Ï¡¢¥·¥¹¥Æ¥à¤Ç»ÈÍѤ·¤Æ¤¤¤ë Debian ¥¢¡¼¥­¥Æ¥¯¥Á¥ã (i386, m68k, powerpc, \&.\&.\&.) ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤ +\fIsources\&.list\fR ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤǤ­¤Þ¤¹¡£ °ìÈÌŪ¤Ë¡¢¤³¤ì¤ÏÀµ¤·¤¤¥Ñ¥¹¤ò»ØÄꤹ¤ë¤È¤­¤Ëµ¤¤Ë¤¹¤ë¤À¤±¤Ç¤¹¡£ ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢APT ¤Ï¸½ºß¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç URI ¤ò¼«Æ°Åª¤ËÀ¸À®¤·¤Þ¤¹¡£ .PP @@ -93,10 +92,10 @@ $(ARCH) .PP Îã: .sp -.RS 3n +.RS 4 .nf -deb http://http.us.debian.org/debian stable main contrib non\-free -deb http://http.us.debian.org/debian dists/stable\-updates/ +deb http://http\&.us\&.debian\&.org/debian stable main contrib non\-free +deb http://http\&.us\&.debian\&.org/debian dists/stable\-updates/ .fi .RE @@ -105,28 +104,28 @@ deb http://http.us.debian.org/debian dists/stable\-updates/ ¸½ºßǧ¼±¤¹¤ë URI Âбþ¤Ï¡¢cdrom, file, http, ftp ¤Ç¤¹¡£ .PP file -.RS 3n +.RS 4 file ¥¹¥­¡¼¥à¤Ï¡¢¥·¥¹¥Æ¥àÆâ¤ÎǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢ ¥¢¡¼¥«¥¤¥Ö¤È¤·¤Æ°·¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï NFS ¥Þ¥¦¥ó¥È¤ä¥í¡¼¥«¥ë¥ß¥é¡¼¤ÇÊØÍø¤Ç¤¹¡£ .RE .PP cdrom -.RS 3n +.RS 4 cdrom ¥¹¥­¡¼¥à¤Ï¡¢APT ¤¬¥í¡¼¥«¥ë CD\-ROM ¥É¥é¥¤¥Ö¤ò¡¢ ¥á¥Ç¥£¥¢¸ò´¹¤·¤Ê¤¬¤é»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¼èÆÀ¸µ¥ê¥¹¥È¤Ë cdrom ¥¨¥ó¥È¥ê¤òÄɲ乤ë¤Ë¤Ï¡¢ -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP http -.RS 3n +.RS 4 http ¥¹¥­¡¼¥à¤Ï¥¢¡¼¥«¥¤¥Ö¤È¤·¤Æ¡¢HTTP ¥µ¡¼¥Ð¤ò»ØÄꤷ¤Þ¤¹¡£ ´Ä¶­ÊÑ¿ô \fBhttp_proxy\fR ¤¬¡¢ http://server:port/ ¤È¸À¤Ã¤¿·Á¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢ \fBhttp_proxy\fR -¤Ç»ØÄꤷ¤¿ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£ ¥æ¡¼¥¶Ç§¾Ú¤¬É¬Í×¤Ê HTTP/1.1 ¥×¥í¥­¥·¤Î¾ì¹ç¡¢ http://user:pass@server:port/ ¤È¸À¤¦·Á¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Îǧ¾ÚÊýË¡¤Ï°ÂÁ´¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ +¤Ç»ØÄꤷ¤¿ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£ ¥æ¡¼¥¶Ç§¾Ú¤¬É¬Í×¤Ê HTTP/1\&.1 ¥×¥í¥­¥·¤Î¾ì¹ç¡¢ http://user:pass@server:port/ ¤È¸À¤¦·Á¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Îǧ¾ÚÊýË¡¤Ï°ÂÁ´¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP ftp -.RS 3n +.RS 4 ftp ¥¹¥­¡¼¥à¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥µ¡¼¥Ð¤ò»ØÄꤷ¤Þ¤¹¡£ APT ¤Î FTP ¤Î¿¶¤ëÉñ¤¤¤Ï¡¢¹âÅÙ¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£ ¾ÜºÙ¤Ï¡¢\fBapt.conf\fR(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ ftp ¥×¥í¥­¥·¤Ï¡¢ \fBftp_proxy\fR @@ -134,12 +133,12 @@ ftp .RE .PP copy -.RS 3n +.RS 4 copy ¥¹¥­¡¼¥à¤Ï¡¢file ¥¹¥­¡¼¥à¤ÈƱÍͤǤ¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò¤½¤Î¾ì¤Ç»ÈÍѤ»¤º¡¢ ¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤¹¤ë¤È¤³¤í¤¬°ã¤¤¤Þ¤¹¡£ zip ¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤Æ¤¤¤Æ¡¢APT ¤Ç¥³¥Ô¡¼¤ò¹Ô¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£ .RE .PP rsh, ssh -.RS 3n +.RS 4 rsh/ssh ¥á¥½¥Ã¥É¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥æ¡¼¥¶¤Ç¥ê¥â¡¼¥È¥Û¥¹¥È¤ËÀܳ¤·¡¢ ¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤Ë rsh/ssh ¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤¢¤é¤«¤¸¤á RSA ¥­¡¼¤ä rhosts ¤ÎÇÛÃÖ¤¬É¬ÍפǤ¹¤¬¡¢ ¥Ñ¥¹¥ï¡¼¥É¤Ê¤·Ç§¾Ú¤¬²Äǽ¤Ç¤¹¡£ ¥ê¥â¡¼¥È¥Û¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤ÎºÝ¡¢ ¥Õ¥¡¥¤¥ëžÁ÷¤Ëɸ½à¤Î \fBfind\fR ¥³¥Þ¥ó¥É¤ä @@ -150,110 +149,105 @@ rsh/ssh .PP /home/jason/debian ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë stable/main, stable/contrib, stable/non\-free ÍÑ¤Î¥í¡¼¥«¥ë (¤Þ¤¿¤Ï NFS) ¥¢¡¼¥«¥¤¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian stable main contrib non\-free .fi .RE -.sp .PP ¾åµ­Æ±ÍͤǤ¹¤¬¡¢ÉÔ°ÂÄêÈǤò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian unstable main contrib non\-free .fi .RE -.sp .PP ¾åµ­¤Î¥½¡¼¥¹¹Ô .sp -.RS 3n +.RS 4 .nf deb\-src file:/home/jason/debian unstable main contrib non\-free .fi .RE -.sp .PP -archive.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ hamm/main ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ +archive\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ hamm/main ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb http://archive.debian.org/debian\-archive hamm main +deb http://archive\&.debian\&.org/debian\-archive hamm main .fi .RE -.sp .PP -ftp.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î stable/contrib ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ +ftp\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î stable/contrib ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian stable contrib +deb ftp://ftp\&.debian\&.org/debian stable contrib .fi .RE -.sp .PP -ftp.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î unstable/contrib ¤ò»ÈÍѤ·¤Þ¤¹¡£ -\fIsources.list\fR +ftp\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î unstable/contrib ¤ò»ÈÍѤ·¤Þ¤¹¡£ +\fIsources\&.list\fR ¤Ë¾åµ­¥µ¥ó¥×¥ë¤È°ì½ï¤Ë»ØÄꤵ¤ì¤¿¾ì¹ç¡¢ ξÊý¤Î¥ê¥½¡¼¥¹¹Ô¤ËÂбþ¤¹¤ë FTP ¥»¥Ã¥·¥ç¥ó¤Ï¤Ò¤È¤Ä¤À¤±¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian unstable contrib +deb ftp://ftp\&.debian\&.org/debian unstable contrib .fi .RE -.sp .PP -nonus.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ +nonus\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb http://nonus.debian.org/debian\-non\-US stable/non\-US main contrib non\-free +deb http://nonus\&.debian\&.org/debian\-non\-US stable/non\-US main contrib non\-free .fi .RE -.sp .PP -nonus.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤Þ¤¿¡¢i386 ¥Þ¥·¥ó¤Ç¤Ï +nonus\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤Þ¤¿¡¢i386 ¥Þ¥·¥ó¤Ç¤Ï \fIunstable/binary\-i386\fR °Ê²¼¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¡¢ m68k ¥Þ¥·¥ó¤Ç¤Ï \fIunstable/binary\-m68k\fR °Ê²¼¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¡¢ ¤½¤Î¾¥µ¥Ý¡¼¥È¤¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤´¤È¤Î¥Õ¥¡¥¤¥ë¤Î¤ß»ÈÍѤ·¤Þ¤¹¡£ [¤³¤Î¥µ¥ó¥×¥ë¤ÏÊÑ¿ôŸ³«¤Î»ÈÍÑË¡¤ÎÀâÌÀ¤Ç¤·¤«¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ non\-us ¤Ï¤³¤Î¤è¤¦¤Ê¹½Â¤¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó] .sp -.RS 3n +.RS 4 .nf -deb http://ftp.de.debian.org/debian\-non\-US unstable/binary\-$(ARCH)/ +deb http://ftp\&.de\&.debian\&.org/debian\-non\-US unstable/binary\-$(ARCH)/ .fi .RE .sp .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/ja/sources.list.ja.5 b/doc/ja/sources.list.ja.5 index cb41f93..796a034 100644 --- a/doc/ja/sources.list.ja.5 +++ b/doc/ja/sources.list.ja.5 @@ -1,11 +1,11 @@ .\" Title: sources.list .\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 +.\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 29 February 2004 .\" Manual: .\" Source: Linux .\" -.TH "SOURCES.LIST" "5" "29 February 2004" "Linux" "" +.TH "SOURCES\&.LIST" "5" "29 February 2004" "Linux" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,7 @@ sources.list \- APT Íѥѥ屡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È .SH "ÀâÌÀ" .PP -¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÊݴɾì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£ º£²ó¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï¡¢ Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¤ßµ­½Ò¤·¤Þ¤¹¡£ ¤³¤ÎÀ©¸æ¥Õ¥¡¥¤¥ë¤Ï¡¢\fI/etc/apt/sources.list\fR +¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¥ê¥½¡¼¥¹¥ê¥¹¥È¤Ï¡¢ ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ÎÊݴɾì½ê¤òÆÃÄꤹ¤ë¤Î¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£ º£²ó¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï¡¢ Debian GNU/Linux ¥·¥¹¥Æ¥à¤Ç»ÈÍѤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¤ßµ­½Ò¤·¤Þ¤¹¡£ ¤³¤ÎÀ©¸æ¥Õ¥¡¥¤¥ë¤Ï¡¢\fI/etc/apt/sources\&.list\fR ¤Ë¤¢¤ê¤Þ¤¹¡£ .PP ¥½¡¼¥¹¥ê¥¹¥È¤ÏÊ£¿ô¤ÎÍ­¸ú¤Ê¼èÆÀ¸µ¤È¡¢ ÍÍ¡¹¤Ê¼èÆÀ¥á¥Ç¥£¥¢¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ë¤Ï 1 ¹Ô¤´¤È¼èÆÀ¸µ¤òÎóµó¤·¡¢¾å¤ÎÊý¤Ë¤¢¤ë¤â¤Î¤«¤é»ÈÍѤ·¤Þ¤¹¡£ ¹Ô¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢¥¿¥¤¥× uri °ú¿ô @@ -27,13 +27,13 @@ uri ¤Ï Universal Resource Identifier (URI) ¤Ç¡¢ ¤è¤¯ÃΤé¤ì¤¿ URL ¤Î¥¹¡¼¥Ñ¡¼¥»¥Ã¥È¤Ç¤¹¡£ ¹Ô¤Î»Ä¤ê¤Ë # ¤òÉÕ¤±¤Æ¡¢¥³¥á¥ó¥È¤Ë¤Ç¤­¤Þ¤¹¡£ .SH "SOURCES.LIST.D" .PP -\fI/etc/apt/sources.list.d\fR +\fI/etc/apt/sources\&.list\&.d\fR ¥Ç¥£¥ì¥¯¥È¥ê¤Ë ¥Õ¥¡¥¤¥ë̾¤¬ -.list -¤Ç½ª¤ï¤ë¸ÄÊÌ¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤¯¤È¡¢ sources.list ¥¨¥ó¥È¥ê¤ËÄɲäǤ­¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ Ä̾ï¤Î -\fIsources.list\fR +\&.list +¤Ç½ª¤ï¤ë¸ÄÊÌ¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤¯¤È¡¢ sources\&.list ¥¨¥ó¥È¥ê¤ËÄɲäǤ­¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢ Ä̾ï¤Î +\fIsources\&.list\fR ¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¤Ç¤¹¡£ -.SH "DEB ¥¿¥¤¥×¤È DEB\-SRC ¥¿¥¤¥×" +.SH "DEB ¥¿¥¤¥×¤È DEB-SRC ¥¿¥¤¥×" .PP deb ¥¿¥¤¥×¤Ç¤Ïŵ·¿Åª¤Ê 2 Ãʳ¬¤Î Debian ¥¢¡¼¥«¥¤¥Ö (\fIdistribution/component\fR) ¤òµ­½Ò¤·¤Þ¤¹¡£ ¤è¤¯¤¢¤ë¥±¡¼¥¹¤Ç¤Ï¡¢distribution @@ -57,15 +57,14 @@ deb ¥¿¥¤¥×¤È deb\-src ¥¿¥¤¥×¤Ç»ÈÍѤ¹¤ë -\fIsources.list\fR +\fIsources\&.list\fR ¥¨¥ó¥È¥ê¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¡¢°Ê²¼¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb uri distribution [component1] [component2] [...] +deb uri distribution [component1] [component2] [\&.\&.\&.] .fi .RE -.sp .PP deb ¥¿¥¤¥×¤Î URI ¤Ï¡¢ APT ¤¬¾ðÊó¤ò¸«¤Ä¤±¤é¤ì¤ë¤è¤¦¤Ë¡¢ Debian ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î´ðÄì¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ @@ -82,8 +81,8 @@ distribution $(ARCH) ÊÑ¿ô¤ò´Þ¤à¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£ $(ARCH) -ÊÑ¿ô¤Ï¡¢¥·¥¹¥Æ¥à¤Ç»ÈÍѤ·¤Æ¤¤¤ë Debian ¥¢¡¼¥­¥Æ¥¯¥Á¥ã (i386, m68k, powerpc, ...) ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤ -\fIsources.list\fR +ÊÑ¿ô¤Ï¡¢¥·¥¹¥Æ¥à¤Ç»ÈÍѤ·¤Æ¤¤¤ë Debian ¥¢¡¼¥­¥Æ¥¯¥Á¥ã (i386, m68k, powerpc, \&.\&.\&.) ¤ËŸ³«¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ë¤è¤ê¡¢¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë°Í¸¤·¤Ê¤¤ +\fIsources\&.list\fR ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤǤ­¤Þ¤¹¡£ °ìÈÌŪ¤Ë¡¢¤³¤ì¤ÏÀµ¤·¤¤¥Ñ¥¹¤ò»ØÄꤹ¤ë¤È¤­¤Ëµ¤¤Ë¤¹¤ë¤À¤±¤Ç¤¹¡£ ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢APT ¤Ï¸½ºß¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç URI ¤ò¼«Æ°Åª¤ËÀ¸À®¤·¤Þ¤¹¡£ .PP @@ -93,10 +92,10 @@ $(ARCH) .PP Îã: .sp -.RS 3n +.RS 4 .nf -deb http://http.us.debian.org/debian stable main contrib non\-free -deb http://http.us.debian.org/debian dists/stable\-updates/ +deb http://http\&.us\&.debian\&.org/debian stable main contrib non\-free +deb http://http\&.us\&.debian\&.org/debian dists/stable\-updates/ .fi .RE @@ -105,28 +104,28 @@ deb http://http.us.debian.org/debian dists/stable\-updates/ ¸½ºßǧ¼±¤¹¤ë URI Âбþ¤Ï¡¢cdrom, file, http, ftp ¤Ç¤¹¡£ .PP file -.RS 3n +.RS 4 file ¥¹¥­¡¼¥à¤Ï¡¢¥·¥¹¥Æ¥àÆâ¤ÎǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢ ¥¢¡¼¥«¥¤¥Ö¤È¤·¤Æ°·¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¤³¤ì¤Ï NFS ¥Þ¥¦¥ó¥È¤ä¥í¡¼¥«¥ë¥ß¥é¡¼¤ÇÊØÍø¤Ç¤¹¡£ .RE .PP cdrom -.RS 3n +.RS 4 cdrom ¥¹¥­¡¼¥à¤Ï¡¢APT ¤¬¥í¡¼¥«¥ë CD\-ROM ¥É¥é¥¤¥Ö¤ò¡¢ ¥á¥Ç¥£¥¢¸ò´¹¤·¤Ê¤¬¤é»È¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¼èÆÀ¸µ¥ê¥¹¥È¤Ë cdrom ¥¨¥ó¥È¥ê¤òÄɲ乤ë¤Ë¤Ï¡¢ -\fBapt\-cdrom\fR(8) +\fBapt-cdrom\fR(8) ¥×¥í¥°¥é¥à¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP http -.RS 3n +.RS 4 http ¥¹¥­¡¼¥à¤Ï¥¢¡¼¥«¥¤¥Ö¤È¤·¤Æ¡¢HTTP ¥µ¡¼¥Ð¤ò»ØÄꤷ¤Þ¤¹¡£ ´Ä¶­ÊÑ¿ô \fBhttp_proxy\fR ¤¬¡¢ http://server:port/ ¤È¸À¤Ã¤¿·Á¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢ \fBhttp_proxy\fR -¤Ç»ØÄꤷ¤¿ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£ ¥æ¡¼¥¶Ç§¾Ú¤¬É¬Í×¤Ê HTTP/1.1 ¥×¥í¥­¥·¤Î¾ì¹ç¡¢ http://user:pass@server:port/ ¤È¸À¤¦·Á¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Îǧ¾ÚÊýË¡¤Ï°ÂÁ´¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ +¤Ç»ØÄꤷ¤¿ ¥×¥í¥­¥·¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£ ¥æ¡¼¥¶Ç§¾Ú¤¬É¬Í×¤Ê HTTP/1\&.1 ¥×¥í¥­¥·¤Î¾ì¹ç¡¢ http://user:pass@server:port/ ¤È¸À¤¦·Á¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤Îǧ¾ÚÊýË¡¤Ï°ÂÁ´¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ .RE .PP ftp -.RS 3n +.RS 4 ftp ¥¹¥­¡¼¥à¤Ï¡¢¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥µ¡¼¥Ð¤ò»ØÄꤷ¤Þ¤¹¡£ APT ¤Î FTP ¤Î¿¶¤ëÉñ¤¤¤Ï¡¢¹âÅÙ¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£ ¾ÜºÙ¤Ï¡¢\fBapt.conf\fR(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ ftp ¥×¥í¥­¥·¤Ï¡¢ \fBftp_proxy\fR @@ -134,12 +133,12 @@ ftp .RE .PP copy -.RS 3n +.RS 4 copy ¥¹¥­¡¼¥à¤Ï¡¢file ¥¹¥­¡¼¥à¤ÈƱÍͤǤ¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤ò¤½¤Î¾ì¤Ç»ÈÍѤ»¤º¡¢ ¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤¹¤ë¤È¤³¤í¤¬°ã¤¤¤Þ¤¹¡£ zip ¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤Æ¤¤¤Æ¡¢APT ¤Ç¥³¥Ô¡¼¤ò¹Ô¤¦¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£ .RE .PP rsh, ssh -.RS 3n +.RS 4 rsh/ssh ¥á¥½¥Ã¥É¤Ï¡¢Í¿¤¨¤é¤ì¤¿¥æ¡¼¥¶¤Ç¥ê¥â¡¼¥È¥Û¥¹¥È¤ËÀܳ¤·¡¢ ¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Î¤Ë rsh/ssh ¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤¢¤é¤«¤¸¤á RSA ¥­¡¼¤ä rhosts ¤ÎÇÛÃÖ¤¬É¬ÍפǤ¹¤¬¡¢ ¥Ñ¥¹¥ï¡¼¥É¤Ê¤·Ç§¾Ú¤¬²Äǽ¤Ç¤¹¡£ ¥ê¥â¡¼¥È¥Û¥¹¥È¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤ÎºÝ¡¢ ¥Õ¥¡¥¤¥ëžÁ÷¤Ëɸ½à¤Î \fBfind\fR ¥³¥Þ¥ó¥É¤ä @@ -150,110 +149,105 @@ rsh/ssh .PP /home/jason/debian ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë stable/main, stable/contrib, stable/non\-free ÍÑ¤Î¥í¡¼¥«¥ë (¤Þ¤¿¤Ï NFS) ¥¢¡¼¥«¥¤¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian stable main contrib non\-free .fi .RE -.sp .PP ¾åµ­Æ±ÍͤǤ¹¤¬¡¢ÉÔ°ÂÄêÈǤò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf deb file:/home/jason/debian unstable main contrib non\-free .fi .RE -.sp .PP ¾åµ­¤Î¥½¡¼¥¹¹Ô .sp -.RS 3n +.RS 4 .nf deb\-src file:/home/jason/debian unstable main contrib non\-free .fi .RE -.sp .PP -archive.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ hamm/main ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ +archive\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ hamm/main ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb http://archive.debian.org/debian\-archive hamm main +deb http://archive\&.debian\&.org/debian\-archive hamm main .fi .RE -.sp .PP -ftp.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î stable/contrib ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ +ftp\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î stable/contrib ¤Î¤ß¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian stable contrib +deb ftp://ftp\&.debian\&.org/debian stable contrib .fi .RE -.sp .PP -ftp.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î unstable/contrib ¤ò»ÈÍѤ·¤Þ¤¹¡£ -\fIsources.list\fR +ftp\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë FTP ¥¢¥¯¥»¥¹¤·¡¢ debian ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î unstable/contrib ¤ò»ÈÍѤ·¤Þ¤¹¡£ +\fIsources\&.list\fR ¤Ë¾åµ­¥µ¥ó¥×¥ë¤È°ì½ï¤Ë»ØÄꤵ¤ì¤¿¾ì¹ç¡¢ ξÊý¤Î¥ê¥½¡¼¥¹¹Ô¤ËÂбþ¤¹¤ë FTP ¥»¥Ã¥·¥ç¥ó¤Ï¤Ò¤È¤Ä¤À¤±¤Ë¤Ê¤ê¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb ftp://ftp.debian.org/debian unstable contrib +deb ftp://ftp\&.debian\&.org/debian unstable contrib .fi .RE -.sp .PP -nonus.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ +nonus\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ .sp -.RS 3n +.RS 4 .nf -deb http://nonus.debian.org/debian\-non\-US stable/non\-US main contrib non\-free +deb http://nonus\&.debian\&.org/debian\-non\-US stable/non\-US main contrib non\-free .fi .RE -.sp .PP -nonus.debian.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤Þ¤¿¡¢i386 ¥Þ¥·¥ó¤Ç¤Ï +nonus\&.debian\&.org ¤Î¥¢¡¼¥«¥¤¥Ö¤Ë HTTP ¥¢¥¯¥»¥¹¤·¡¢ debian\-non\-US ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ò»ÈÍѤ·¤Þ¤¹¡£ ¤Þ¤¿¡¢i386 ¥Þ¥·¥ó¤Ç¤Ï \fIunstable/binary\-i386\fR °Ê²¼¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¡¢ m68k ¥Þ¥·¥ó¤Ç¤Ï \fIunstable/binary\-m68k\fR °Ê²¼¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¡¢ ¤½¤Î¾¥µ¥Ý¡¼¥È¤¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤´¤È¤Î¥Õ¥¡¥¤¥ë¤Î¤ß»ÈÍѤ·¤Þ¤¹¡£ [¤³¤Î¥µ¥ó¥×¥ë¤ÏÊÑ¿ôŸ³«¤Î»ÈÍÑË¡¤ÎÀâÌÀ¤Ç¤·¤«¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ non\-us ¤Ï¤³¤Î¤è¤¦¤Ê¹½Â¤¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó] .sp -.RS 3n +.RS 4 .nf -deb http://ftp.de.debian.org/debian\-non\-US unstable/binary\-$(ARCH)/ +deb http://ftp\&.de\&.debian\&.org/debian\-non\-US unstable/binary\-$(ARCH)/ .fi .RE .sp .SH "´ØÏ¢¹àÌÜ" .PP -\fBapt\-cache\fR(8) +\fBapt-cache\fR(8) \fBapt.conf\fR(5) .SH "¥Ð¥°" .PP -[1]\&\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ -\fI/usr/share/doc/debian/bug\-reporting.txt\fR +\fIAPT ¥Ð¥°¥Ú¡¼¥¸\fR\&[1]¤ò ¤´Í÷¤¯¤À¤µ¤¤¡£ APT ¤Î¥Ð¥°¤òÊó¹ð¤¹¤ë¾ì¹ç¤Ï¡¢ +\fI/usr/share/doc/debian/bug\-reporting\&.txt\fR ¤ä \fBreportbug\fR(1) ¥³¥Þ¥ó¥É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ .SH "Ìõ¼Ô" .PP ÁÒß· ˾ - + (2003\-2006), Debian JP Documentation ML - + .SH "AUTHORS" .PP \fBJason Gunthorpe\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. .PP \fBAPT team\fR .sp -1n -.IP "" 3n +.IP "" 4 Author. -.SH "REFERENCES" -.TP 3 -1.\ APT ¥Ð¥°¥Ú¡¼¥¸ +.SH "NOTES" +.IP " 1." 4 +APT ¥Ð¥°¥Ú¡¼¥¸ +.RS 4 \%http://bugs.debian.org/src:apt +.RE diff --git a/doc/makefile b/doc/makefile index 31ee061..6ea1c13 100644 --- a/doc/makefile +++ b/doc/makefile @@ -15,12 +15,12 @@ include $(DEBIANDOC_H) SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ apt-config.8 apt_preferences.5 \ apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \ - apt-key.8 apt-secure.8 + apt-key.8 apt-secure.8 apt-mark.8 INCLUDES = apt.ent include $(XML_MANPAGE_H) # Examples -SOURCE = examples/apt.conf examples/sources.list examples/configure-index +SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf TO = $(DOC) TARGET = binary include $(COPY_H) @@ -42,3 +42,24 @@ doc.ja: %.ja: doc.pl: %.pl: $(MAKE) -C pl $* + +ifdef DOXYGEN +DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) + +clean: doxygen-clean + +doxygen-clean: + rm -fr $(BUILD)/doc/doxygen + rm -f $(BUILD)/doc/doxygen-stamp + +$(BUILD)/doc/Doxyfile: Doxyfile.in + (cd $(BUILD) && ./config.status doc/Doxyfile) + +$(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile + rm -fr $(BUILD)/doc/doxygen + $(DOXYGEN) $(BUILD)/doc/Doxyfile + touch $(BUILD)/doc/doxygen-stamp + +doc: $(BUILD)/doc/doxygen-stamp + +endif diff --git a/doc/offline.sgml b/doc/offline.sgml index ecbd85c..99e260b 100644 --- a/doc/offline.sgml +++ b/doc/offline.sgml @@ -44,7 +44,9 @@ archive but can easily fit a subset large enough for most users. The idea is to use APT to generate a list of packages that are required and then fetch them onto the disc using another machine with good connectivity. It is even possible to use another Debian machine with APT or to use a completely -different OS and a download tool like wget. +different OS and a download tool like wget. Let remote host mean the +machine downloading the packages, and target host the one with bad or +no connection.

This is achieved by creatively manipulating the APT configuration file. The @@ -87,9 +89,9 @@ download. The disk directory structure should look like: The configuration file should tell APT to store its files on the disc and to use the configuration files on the disc as well. The sources.list should contain the proper sites that you wish to use from the remote machine, and -the status file should be a copy of /var/lib/dpkg/status. Please note, -if you are using a local archive you must use copy URIs, the syntax is identical -to file URIs. +the status file should be a copy of /var/lib/dpkg/status from the +target host. Please note, if you are using a local archive you must use +copy URIs, the syntax is identical to file URIs.

apt.conf must contain the necessary information to make APT use the @@ -99,7 +101,7 @@ disc: APT { /* This is not necessary if the two machines are the same arch, it tells - the remote APT what architecture the Debian machine is */ + the remote APT what architecture the target machine is */ Architecture "i386"; Get::Download-Only "true"; @@ -125,7 +127,7 @@ More details can be seen by examining the apt.conf man page and the sample configuration file in /usr/share/doc/apt/examples/apt.conf.

-On the remote Debian machine the first thing to do is mount the disc and copy +On the target machine the first thing to do is mount the disc and copy /var/lib/dpkg/status to it. You will also need to create the directories outlined in the Overview, archives/partial/ and lists/partial/ Then take the disc to the remote machine and configure the sources.list. @@ -136,17 +138,17 @@ On the remote machine execute the following: # apt-get update [ APT fetches the package files ] # apt-get dist-upgrade - [ APT fetches all the packages needed to upgrade your machine ] + [ APT fetches all the packages needed to upgrade the target machine ] The dist-upgrade command can be replaced with any-other standard APT commands, -particularly dselect-upgrad. You can even use an APT front end such as +particularly dselect-upgrade. You can even use an APT front end such as dselect However this presents a problem in communicating your selections back to the local computer.

Now the disc contains all of the index files and archives needed to upgrade -the Debian machine. Take the disc back and run: +the target machine. Take the disc back and run: # export APT_CONFIG="/disc/apt.conf" diff --git a/doc/pl/makefile b/doc/pl/makefile index 72a5054..94939e1 100644 --- a/doc/pl/makefile +++ b/doc/pl/makefile @@ -7,4 +7,5 @@ include ../../buildlib/defaults.mak # Debian Doc SGML Documents SOURCE = offline.pl.sgml +DEBIANDOC_HTML_OPTIONS=-l pl include $(DEBIANDOC_H) diff --git a/doc/pl/offline.pl.sgml b/doc/pl/offline.pl.sgml index 2adb255..0d301d4 100644 --- a/doc/pl/offline.pl.sgml +++ b/doc/pl/offline.pl.sgml @@ -1,80 +1,81 @@ - + -U�ywanie APT w trybie offline +U¿ywanie APT w trybie offline Jason Gunthorpe jgg@debian.org -Polskie t�umaczenie Krzysztof Fiertek akfedux@megapolis.pl -$Id: offline.pl.sgml,v 1.1 2004/07/29 16:43:13 mdz Exp $ +Polskie t³umaczenie Krzysztof Fiertek akfedux@megapolis.pl +$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $ -Dokument ten opisuje jak u�ywa� programu APT w �rodowiskach niesieciowych, -a w szczeg�lno�ci metod� pozwalaj�c� na robienie aktualizacji systemu. +Dokument ten opisuje u¿ywanie programu APT w ¶rodowiskach pozbawionych dostêpu, +do sieci, a w szczególno¶ci metodê pozwalaj±c± na robienie aktualizacji systemu. Copyright © Jason Gunthorpe, 1999.

-Copyright © polskiego t�umaczenia Krzysztof Fiertek, 2004. +Copyright © polskiego t³umaczenia Krzysztof Fiertek, 2004.

-"APT" i ten dokument s� oprogramowaniem wolnodost�pnym; mo�esz -rozpowszechnia� je i/lub zmienia� w zgodzie z postanowieniami -"Og�lnej Licencji Publicznej GNU" (GNU General Public License) -takiej, jak zosta�a opublikowana przez "Fundacje Wolnego -Oprogramowania (Free Software Foundation); albo w wersji 2 tej�e -licencji, albo (tw�j wyb�r) w dowolnej p��niejszej. +"APT" i ten dokument s± oprogramowaniem wolnodostêpnym; mo¿esz +rozpowszechniaæ je i/lub zmieniaæ w zgodzie z postanowieniami +"Ogólnej Licencji Publicznej GNU" (GNU General Public License) +takiej, jak zosta³a opublikowana przez "Fundacje Wolnego +Oprogramowania (Free Software Foundation); albo w wersji 2 tej¿e +licencji, albo (twój wybór) w dowolnej pó¼niejszej.

-Wi�cej szczeg���w mo�esz uzyska� przegl�daj�c plik zawieraj�cy pe�ny tekst -licencji (w systemach Debian jest to plik /usr/doc/copyright/GPL). - -Wst�p +Wstêp Wprowadzenie

-Normalnie APT wymaga bezpo�redniego dost�pu do archiw�w Debiana poprzez -sie� lokaln� albo przez sie� internetow�. Kolejn� niedogodno�ci� mo�e by� -fakt, �e nasz komputer, kt�ry pracuje na wolnym ��czu takim jak modem, -jest znacznie oddalony od innnego komputera z szybkim ��czem. +Normalnie APT wymaga bezpo¶redniego dostêpu do archiwów Debiana przez +sieæ lokaln± albo przez sieæ internetow±. Kolejn± niedogodno¶ci± mo¿e byæ +fakt, ¿e nasz komputer, który pracuje na powolnym ³±czu takim jak modem, +jest znacznie oddalony od innego komputera z szybkim ³±czem.

-Rozwi�zaniem tego problemu jest u�ycie pojemnych przeno�nych no�nik�w -takich jak dyskietka Zip lub dysk SuperDisk. No�niki te nie s� -wystarczaj�co pojemne, by zgromadzi� kompletne archiwum Debiana, ale mo�na -�mia�o dopasowa� podzbi�r du�ego archiwum wystarczaj�cy dla wi�kszo�ci -u�ytkownik�w. Pomys� polega na tym, by u�y� programu APT do wygenerowania -listy pakiet�w, kt�re s� wymagane, nast�pnie pobraniu ich na dysk u�ywaj�c -innego komputera z w�a�ciw� zwarto�ci�. Jest nawet mo�liwe, by u�y� innego -komputera z Debianem z zainstalowanym programem APT lub zupe�nie innym -systemem operacyjnym i programem narz�dziowym do pobierania plik�w takim +Rozwi±zaniem tego problemu jest u¿ycie pojemnych przeno¶nych no¶ników +takich jak dyskietka Zip lub dysk SuperDisk. No¶niki te nie s± +wystarczaj±co pojemne, by zgromadziæ kompletne archiwum Debiana, ale mo¿na +¶mia³o dopasowaæ podzbiór du¿ego archiwum wystarczaj±cy dla wiêkszo¶ci +u¿ytkowników. Pomys³ polega na tym, by u¿yæ programu APT do wygenerowania +listy pakietów, które s± wymagane, a nastêpnie pobraniu ich na dysk, u¿ywaj±c +innego komputera z w³a¶ciw± zwarto¶ci±. Jest nawet mo¿liwe, by u¿yæ innego +komputera z Debianem z zainstalowanym programem APT lub zupe³nie innym +systemem operacyjnym i programem narzêdziowym do pobierania plików takim jak wget.

-Osi�gni�te jest to przez tw�rcze manipulowanie plikiem konfiguracyjnym -programu APT. Rzecz� niezb�dn� jest poinformowanie programu APT, aby wskazywa� -na dysk z plikami archiwum. Nale�y zauwa�y�, �e dysk powinien by� -sformatowany do obs�ugi systemu plik�w takiego jak ext2, fat32 albo vfat -pozwalaj�cych pos�ugiwa� si� d�ugimi nazwami pliku. +Osi±gane jest to przez twórcze manipulowanie plikiem konfiguracyjnym +programu APT. Rzecz± niezbêdn± jest poinformowanie programu APT, aby wskazywa³ +na dysk z plikami archiwum. Nale¿y zauwa¿yæ, ¿e dysk powinien byæ +sformatowany do obs³ugi systemu plików pozwalaj±cego pos³ugiwaæ siê d³ugimi +nazwami plików (np. ext2, fat32 albo vfat). + -U�ywanie programu APT na obu komputerach +U¿ywanie programu APT na obu komputerach Wprowadzenie

-APT b�d�cy do dyspozycji na obu komputerach daje najprostsz� kombinacj�. -Zasadniczym pomys�em tej metody jest umie�ci� kopie pliku status na dysku -i u�y� odleg�ego komputera, aby uzyska� najnowsze pliki pakiet�w -i zdecydowa�, kt�re pakiety chcemy pobra�. Struktura katalog�w na dysku -powinna wygl�da� nast�puj�co: +APT bêd±cy do dyspozycji na obu komputerach daje najprostsz± kombinacjê. +Zasadniczym pomys³em tej metody jest umieszczenie kopii pliku status na dysku +i u¿ycie odleg³ego komputera, aby uzyskaæ najnowsze pliki pakietów +i zdecydowaæ, które pakiety trzeba pobraæ. Struktura katalogów na dysku +powinna wygl±daæ nastêpuj±co: /disc/ @@ -89,27 +90,27 @@ powinna wygl�da� nast�puj�co: - + Plik konfiguracyjny

-Plik konfiguracyjny powinien informowa� program APT, aby przechowywa� jego -pliki na dysku, a tak�e u�ywa� plik�w konfiguracyjnych z dysku. Plik -sources.list powinien zawiera� prawid�owe odno�niki, kt�rych oczekujesz -u�y� od zdalnego komputera, a plik status powinien by� kopi� -/var/lib/dpkg/status. Zauwa�, �e je�li u�ywasz lokalnego archiwum -musisz u�y� tych samych odno�nik�w o identycznej sk�adni. +Plik konfiguracyjny powinien informowaæ program APT, aby przechowywa³ swoje +pliki na dysku, a tak¿e u¿ywa³ plików konfiguracyjnych z dysku. Plik +sources.list powinien zawieraæ prawid³owe odno¶niki, których nale¿y +u¿yæ na zdalnym komputerze, a plik status powinien byæ kopi± +/var/lib/dpkg/status. Zauwa¿, ¿e je¶li u¿ywasz lokalnego archiwum +musisz u¿yæ tych samych odno¶ników o identycznej sk³adni.

-apt.conf musi zawiera� niezb�dne wpisy, by APT korzysta� z dysku: +apt.conf musi zawieraæ niezbêdne wpisy, by APT korzysta³ z dysku: APT { - /* Ten wpis nie jest wymagany je�li oba komputery s� tej samej - architektury, m�wi on APTowi na komputerze pobieraj�cym pakiety - jakiej architektury jest nasz komputer */ + /* Ten wpis nie jest wymagany, je¶li oba komputery maj± tê sam± + architekturê; mówi on programowi APT na komputerze pobieraj±cym + pakiety, jaka jest architektura naszego komputera */ Architecture "i386"; Get::Download-Only "true"; @@ -117,29 +118,30 @@ musisz u�y� tych samych odno�nik�w o identycznej sk�adni. Dir { - /* U�yj katalogu disc na informacje stanu i skieruj plik status - z /var/lib/dpkg default */ + /* U¿yj katalogu disc na informacje stanu i przekieruj plik status + z domy¶lnego /var/lib/dpkg */ State "/disc/"; State::status "status"; - // Katalog lokalnie przechowywanych pakiet�w binarnych + // Katalog lokalnie przechowywanych pakietów binarnych Cache::archives "/disc/archives/"; + Cache "/tmp/"; // Lokalizacja pliku sources.list. - Etc "/disc + Etc "/disc"; }; -Wi�cej szczeg���w mo�na zobaczy� w manualu apt.conf i w przyk�adowym pliku -konfiguracyjnym /usr/doc/apt/examples/apt.conf. +Wiêcej szczegó³ów mo¿na zobaczyæ w stronie podrêcznika apt.conf i w przyk³adowym +pliku konfiguracyjnym /usr/share/doc/apt/examples/apt.conf.

-Pierwsz� rzecz� jaka nale�y zrobi� na oddalonym komputerze z Debianem to -zamontowa� dysk i przekopiowa� na niego plik /var/lib/dpkg/status. -Potrzeba tak�e utworzy� stuktur� katalog�w przedstawion� we Wprowadzeniu, -archives/partial/ i lists/partial/. Nast�pnie niesiemy -dysk do oddalonego komputera z szybkim ��czem i konfigurujemy plik +Pierwsz± rzecz±, jak± nale¿y zrobiæ na oddalonym komputerze z Debianem to +zamontowaæ dysk i przekopiowaæ na niego plik /var/lib/dpkg/status. +Trzeba tak¿e utworzyæ stukturê katalogów przedstawion± we "Wprowadzeniu": +archives/partial/ i lists/partial/. Nastêpnie niesiemy +dysk do oddalonego komputera z szybkim ³±czem i konfigurujemy plik sources.list. Na oddalonym komputerze wykonujemy kolejno: @@ -147,58 +149,58 @@ sources.list. Na oddalonym komputerze wykonujemy kolejno: # apt-get update [ APT aktualizuje ustawienia ] # apt-get dist-upgrade - [ APT pobiera wszystkie potrzebne pakiety do aktualizacji twojego systemu ] + [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ] -Polecenie dist-upgrade mo�na zast�pi� ka�dym innym podstawowym poleceniem -APT, w szczeg�lno�ci dselect-upgrade. Mo�esz nawet u�y� APT jako metod� -dost�pu dla dselect. Jednak stworzy to problem w przeniesieniu -twoich operacji wybor�w z powrotem na lokalny komputer. +Polecenie dist-upgrade mo¿na zast±piæ ka¿dym innym podstawowym poleceniem +APT, w szczególno¶ci dselect-upgrade. Mo¿na nawet u¿yæ APT jako metody +dostêpu dla dselect. Jednak stworzy to problem w przeniesieniu +Twoich operacji wyborów z powrotem na lokalny komputer.

W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa -niezb�dne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do +niezbêdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do siebie i wpisujemy: # export APT_CONFIG="/disc/apt.conf" # apt-get check - [ APT tworzy lokaln� kopi� plik�w cache ] - # apt-get --no-d -o dir::etc::status=/var/lib/dpkg/status dist-upgrade - [ Mo�e te� by� inne polecenie programu APT ] + [ APT tworzy lokaln± kopiê plików cache ] + # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade + [ Mo¿e te¿ byæ inne polecenie programu APT ]

-Koniecznym jest do prawid�owego dzia�ania podmieni� plik status na lokalnej -maszynie. To jest bardzo wa�ne! +Do prawid³owego dzia³ania koniecznie nale¿y podaæ plik status z lokalnej +maszyny. To jest bardzo wa¿ne!

-Je�li u�ywasz dselect mo�esz wykona� bardzo ryzykown� operacj� skopiowania -disc/status do /var/lib/dpkg/status tak, �e wszystkie zmiany kt�re -dokona�e� na odleg�ym komputerze s� uaktualnione. Mocno zalecam aby -dokonywa� doboru pakiet�w tylko na lokalnym komputerze, ale nie zawsze -jest to mo�liwe. NIE podmieniaj pliku status je�li dpkg lub APT by�y -uruchamiane w mi�dzyczasie!! +Je¶li u¿ywasz dselect, mo¿esz wykonaæ bardzo ryzykown± operacjê skopiowania +disc/status do /var/lib/dpkg/status, tak ¿e wszystkie zmiany, których +dokona³e¶ na odleg³ym komputerze, bêd± przeniesione. Mocno zalecam, aby +dokonywaæ doboru pakietów tylko na lokalnym komputerze, ale nie zawsze +jest to mo¿liwe. NIE podmieniaj pliku status, je¶li dpkg lub APT by³y +uruchamiane w miêdzyczasie!! -U�ywanie program�w APT i wget +U¿ywanie programów APT i wget Wprowadzenie

-wget jest popularnym i przeno�nym programem narz�dziowym -pobierania plik�w, kt�ry dzia�a na prawie ka�dym komputerze. -W przeciwie�stwie do metody opisanej powy�ej ta wymaga komputera z Debianem, -kt�ry ju� posiada list� dost�pnych pakiet�w. +wget jest popularnym i przeno¶nym programem narzêdziowym +pobierania plików, który dzia³a prawie na ka¿dym komputerze. +W przeciwieñstwie do metody opisanej powy¿ej ta wymaga, aby na lokalnym komputerze +by³a aktualna lista dostêpnych pakietów.

-Nale�y stworzy� katalog disc tylko na pakiety do pobrania z innego -komputera. U�yta zostanie do tego opcja --print-uris programu apt-get, -a nast�pnie przygotujemy skrypt dla programu wget, kt�ry pobierze w�a�ciwe +Nale¿y stworzyæ katalog disc tylko na pakiety do pobrania z innego +komputera. U¿yta zostanie do tego opcja --print-uris programu apt-get, +a nastêpnie przygotujemy skrypt dla programu wget, który pobierze w³a¶ciwe pakiety. @@ -208,28 +210,28 @@ pakiety. Kolejne kroki

-W odr��nieniu od poprzedniej metody dzia�ania ta nie wymaga specjalnych -plik�w konfiguracyjnych. U�ywamy jedynie podstawowych polece� APT, by -wygenerowa� list� plik�w. +W odró¿nieniu od poprzedniej metody dzia³ania ta nie wymaga specjalnych +plików konfiguracyjnych. U¿ywamy jedynie podstawowych poleceñ APT, by +wygenerowaæ listê plików. # apt-get dist-upgrade - [ Wybierz no po znaku zach�ty, upewnij si� czy to w�a?ciwy wyb�r ] + [ Wybierz "no" po znaku zachêty, upewnij siê, czy to w³a¶ciwy wybór ] # apt-get -qq --print-uris dist-upgrade > uris # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script -Tak�e inne opcje ni� dist-upgrade mog� tu by� u�yte, w��czaj�c +Tak¿e inne opcje ni¿ dist-upgrade mog± tu byæ u¿yte, w³±czaj±c dselect-upgrade.

-Plik skryptu /disc/wget-script b�dzie teraz zawiera� list� polece� dla -programu wget, kt�ry uruchomi w porz�dku pobieranie potrzebnych archiw�w. -Skrypt ten nale�y uruchomi� w bie��cym katalogu o punkcie montowania disc -tak aby tu zapisywa� dane na dysku. +Plik skryptu /disc/wget-script bêdzie teraz zawieraæ listê wywo³añ programu +wget, niezbêdnych do pobrania potrzebnych archiwów. +Skrypt ten nale¿y uruchomiæ w bie¿±cym katalogu o punkcie montowania disc, +tak aby tu zapisywa³ dane na dysku.

-Na oddalonym komputerze nale�y wykona� co� takiego +Na oddalonym komputerze nale¿y wykonaæ co¶ takiego # cd /disc @@ -237,14 +239,14 @@ Na oddalonym komputerze nale�y wykona� co� takiego [ czekaj.. ] -Gdy archiwa zosta�y pobrane i dysk wr�ci� do komputera z Debianem, -instalowanie mo�na prowadzi� dalej poleceniem, +Gdy archiwa zostan± pobrane i dysk wróci do komputera z Debianem, +instalowanie mo¿na prowadziæ dalej poleceniem: # apt-get -o dir::cache::archives="/disc/" dist-upgrade -Kt�re u�yje pobrane uprzednio archiwa z dysku. +które u¿yje pobranych uprzednio archiwów z dysku. diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore deleted file mode 100644 index 8d11bcc..0000000 --- a/doc/pt_BR/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -apt_preferences.pt_BR.5 -manpage.links -manpage.refs diff --git a/doc/pt_BR/apt_preferences.pt_BR.5 b/doc/pt_BR/apt_preferences.pt_BR.5 index 834ad59..21531d5 100644 --- a/doc/pt_BR/apt_preferences.pt_BR.5 +++ b/doc/pt_BR/apt_preferences.pt_BR.5 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "APT_PREFERENCES" "5" "04 December 2006" "" "" +.TH "APT_PREFERENCES" "5" "20 January 2009" "" "" .SH NAME apt_preferences \- Arquivo de controle de preferências para o APT @@ -27,7 +27,7 @@ controle sobre qual vers Diversas instâncias da mesma versão de um pacote pode estar disponíveis quando o arquivo \fB\fIsources.list\fB\fR(5) contém referências a mais de uma fonte. Nesse caso, o \fBapt-get\fR faz o download da instância -listada antes no arquivo \fB\fIsources.list\fB\fR(5) . +listada antes no arquivo \fB\fIsources.list\fB\fR(5)\&. O arquivo de preferências do APT não afeta a escolha da instância. .SS "ATRIBUIçõES DE PRIORIDADE PADRãO DO APT" .PP diff --git a/doc/sources.list.5 b/doc/sources.list.5 deleted file mode 100644 index 4e95e2f..0000000 --- a/doc/sources.list.5 +++ /dev/null @@ -1,253 +0,0 @@ -.\" Title: sources.list -.\" Author: Jason Gunthorpe -.\" Generator: DocBook XSL Stylesheets v1.71.0 -.\" Date: 29 February 2004 -.\" Manual: -.\" Source: Linux -.\" -.TH "SOURCES.LIST" "5" "29 February 2004" "Linux" "" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -sources.list \- Package resource list for APT -.SH "DESCRIPTION" -.PP -The package resource list is used to locate archives of the package distribution system in use on the system. At this time, this manual page documents only the packaging system used by the Debian GNU/Linux system. This control file is located in -\fI/etc/apt/sources.list\fR -.PP -The source list is designed to support any number of active sources and a variety of source media. The file lists one source per line, with the most preferred source listed first. The format of each line is: -type uri args -The first item, -type -determines the format for -args -uri -is a Universal Resource Identifier (URI), which is a superset of the more specific and well\-known Universal Resource Locator, or URL. The rest of the line can be marked as a comment by using a #. -.SH "SOURCES.LIST.D" -.PP -The -\fI/etc/apt/sources.list.d\fR -directory provides a way to add sources.list entries in seperate files that end with -.list. The format is the same as for the regular -\fIsources.list\fR -file. -.SH "THE DEB AND DEB\-SRC TYPES" -.PP -The -deb -type describes a typical two\-level Debian archive, -\fIdistribution/component\fR. Typically, -distribution -is generally one of -stable -unstable -or -testing -while component is one of -main -contrib -non\-free -or -non\-us -The -deb\-src -type describes a debian distribution's source code in the same form as the -deb -type. A -deb\-src -line is required to fetch source indexes. -.PP -The format for a -\fIsources.list\fR -entry using the -deb -and -deb\-src -types are: -.sp -.RS 3n -.nf -deb uri distribution [component1] [component2] [...] -.fi -.RE -.PP -The URI for the -deb -type must specify the base of the Debian distribution, from which APT will find the information it needs. -distribution -can specify an exact path, in which case the components must be omitted and -distribution -must end with a slash (/). This is useful for when only a particular sub\-section of the archive denoted by the URI is of interest. If -distribution -does not specify an exact path, at least one -component -must be present. -.PP -distribution -may also contain a variable, -$(ARCH) -which expands to the Debian architecture (i386, m68k, powerpc, ...) used on the system. This permits architecture\-independent -\fIsources.list\fR -files to be used. In general this is only of interest when specifying an exact path, -APT -will automatically generate a URI with the current architecture otherwise. -.PP -Since only one distribution can be specified per line it may be necessary to have multiple lines for the same URI, if a subset of all available distributions or components at that location is desired. APT will sort the URI list after it has generated a complete set internally, and will collapse multiple references to the same Internet host, for instance, into a single connection, so that it does not inefficiently establish an FTP connection, close it, do something else, and then re\-establish a connection to that same host. This feature is useful for accessing busy FTP sites with limits on the number of simultaneous anonymous users. APT also parallelizes connections to different hosts to more effectively deal with sites with low bandwidth. -.PP -It is important to list sources in order of preference, with the most preferred source listed first. Typically this will result in sorting by speed from fastest to slowest (CD\-ROM followed by hosts on a local network, followed by distant Internet hosts, for example). -.PP -Some examples: -.sp -.RS 3n -.nf -deb http://http.us.debian.org/debian stable main contrib non\-free -deb http://http.us.debian.org/debian dists/stable\-updates/ - -.fi -.RE -.SH "URI SPECIFICATION" -.PP -The currently recognized URI types are cdrom, file, http, and ftp. -.PP -file -.RS 3n -The file scheme allows an arbitrary directory in the file system to be considered an archive. This is useful for NFS mounts and local mirrors or archives. -.RE -.PP -cdrom -.RS 3n -The cdrom scheme allows APT to use a local CDROM drive with media swapping. Use the -\fBapt\-cdrom\fR(8) -program to create cdrom entries in the source list. -.RE -.PP -http -.RS 3n -The http scheme specifies an HTTP server for the archive. If an environment variable -\fBhttp_proxy\fR -is set with the format http://server:port/, the proxy server specified in -\fBhttp_proxy\fR -will be used. Users of authenticated HTTP/1.1 proxies may use a string of the format http://user:pass@server:port/ Note that this is an insecure method of authentication. -.RE -.PP -ftp -.RS 3n -The ftp scheme specifies an FTP server for the archive. APT's FTP behavior is highly configurable; for more information see the -\fBapt.conf\fR(5) -manual page. Please note that a ftp proxy can be specified by using the -\fBftp_proxy\fR -environment variable. It is possible to specify a http proxy (http proxy servers often understand ftp urls) using this method and ONLY this method. ftp proxies using http specified in the configuration file will be ignored. -.RE -.PP -copy -.RS 3n -The copy scheme is identical to the file scheme except that packages are copied into the cache directory instead of used directly at their location. This is useful for people using a zip disk to copy files around with APT. -.RE -.PP -rsh, ssh -.RS 3n -The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given user and access the files. No password authentication is possible, prior arrangements with RSA keys or rhosts must have been made. Access to files on the remote uses standard -\fBfind\fR -and -\fBdd\fR -commands to perform the file transfers from the remote. -.RE -.SH "EXAMPLES" -.PP -Uses the archive stored locally (or NFS mounted) at /home/jason/debian for stable/main, stable/contrib, and stable/non\-free. -.sp -.RS 3n -.nf -deb file:/home/jason/debian stable main contrib non\-free -.fi -.RE -.PP -As above, except this uses the unstable (development) distribution. -.sp -.RS 3n -.nf -deb file:/home/jason/debian unstable main contrib non\-free -.fi -.RE -.PP -Source line for the above -.sp -.RS 3n -.nf -deb\-src file:/home/jason/debian unstable main contrib non\-free -.fi -.RE -.PP -Uses HTTP to access the archive at archive.debian.org, and uses only the hamm/main area. -.sp -.RS 3n -.nf -deb http://archive.debian.org/debian\-archive hamm main -.fi -.RE -.PP -Uses FTP to access the archive at ftp.debian.org, under the debian directory, and uses only the stable/contrib area. -.sp -.RS 3n -.nf -deb ftp://ftp.debian.org/debian stable contrib -.fi -.RE -.PP -Uses FTP to access the archive at ftp.debian.org, under the debian directory, and uses only the unstable/contrib area. If this line appears as well as the one in the previous example in -\fIsources.list\fR. a single FTP session will be used for both resource lines. -.sp -.RS 3n -.nf -deb ftp://ftp.debian.org/debian unstable contrib -.fi -.RE -.PP -Uses HTTP to access the archive at nonus.debian.org, under the debian\-non\-US directory. -.sp -.RS 3n -.nf -deb http://nonus.debian.org/debian\-non\-US stable/non\-US main contrib non\-free -.fi -.RE -.PP -Uses HTTP to access the archive at nonus.debian.org, under the debian\-non\-US directory, and uses only files found under -\fIunstable/binary\-i386\fR -on i386 machines, -\fIunstable/binary\-m68k\fR -on m68k, and so forth for other supported architectures. [Note this example only illustrates how to use the substitution variable; non\-us is no longer structured like this] -.sp -.RS 3n -.nf -deb http://ftp.de.debian.org/debian\-non\-US unstable/binary\-$(ARCH)/ -.fi -.RE -.sp -.SH "SEE ALSO" -.PP -\fBapt\-cache\fR(8) -\fBapt.conf\fR(5) -.SH "BUGS" -.PP -[1]\&\fIAPT bug page\fR. If you wish to report a bug in APT, please see -\fI/usr/share/doc/debian/bug\-reporting.txt\fR -or the -\fBreportbug\fR(1) -command. -.SH "AUTHORS" -.PP -\fBJason Gunthorpe\fR -.sp -1n -.IP "" 3n -Author. -.PP -\fBAPT team\fR -.sp -1n -.IP "" 3n -Author. -.SH "REFERENCES" -.TP 3 -1.\ APT bug page -\%http://bugs.debian.org/src:apt diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e47418b..b875086 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -48,9 +48,12 @@ sources.list.d The /etc/apt/sources.list.d directory provides - a way to add sources.list entries in seperate files that end with - .list. The format is the same as for the regular - sources.list file. + a way to add sources.list entries in separate files. + The format is the same as for the regular sources.list file. + File names need to end with + .list and may only contain letters (a-z and A-Z), + digits (0-9), underscore (_), hyphen (-) and period (.) characters. + Otherwise they will be silently ignored. The deb and deb-src types @@ -115,7 +118,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ URI specification - The currently recognized URI types are cdrom, file, http, and ftp. + The currently recognized URI types are cdrom, file, http, ftp, copy, + ssh, rsh. file @@ -163,8 +167,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ rshssh The rsh/ssh method invokes rsh/ssh to connect to a remote host - as a given user and access the files. No password authentication is - possible, prior arrangements with RSA keys or rhosts must have been made. + as a given user and access the files. It is a good idea to do prior + arrangements with RSA keys or rhosts. Access to files on the remote uses standard find and dd commands to perform the file transfers from the remote. diff --git a/dselect/install b/dselect/install index d9d6651..61d1320 100755 --- a/dselect/install +++ b/dselect/install @@ -88,7 +88,8 @@ if [ $RES -eq 0 ]; then ;; prompt) exec 3>&1 - if [ `yesno $"Do you want to erase any previously downloaded .deb files?" y` = y ]; then + echo -n $"Do you want to erase any previously downloaded .deb files?" + if [ `yesno "" y` = y ]; then $APTGET "$APT_OPT0" "$APT_OPT1" clean && echo $"Press enter to continue." && read RES && exit 0; fi diff --git a/dselect/makefile b/dselect/makefile index c2059f9..fab72b2 100644 --- a/dselect/makefile +++ b/dselect/makefile @@ -11,7 +11,7 @@ TO = $(BUILD)/scripts/dselect TARGET = program include $(COPY_H) -LOCAL = dselect +# LOCAL = dselect SOURCE = install update TYPE = sh include $(PODOMAIN_H) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 36139cf..3b1e806 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ @@ -14,10 +10,6 @@ extern "C" { ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-ftparchive.h" -#endif - #include "apt-ftparchive.h" #include @@ -28,6 +20,7 @@ extern "C" { #include #include +#include #include #include @@ -551,8 +544,8 @@ void LoadBinDir(vector &PkgList,Configuration &Setup) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; @@ -905,15 +898,6 @@ bool Clean(CommandLine &CmdL) int main(int argc, const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - CommandLine::Args Args[] = { {'h',"help","help",0}, {0,"md5","APT::FTPArchive::MD5",0}, diff --git a/ftparchive/apt-ftparchive.cc.orig b/ftparchive/apt-ftparchive.cc.orig deleted file mode 100644 index 4afc2ea..0000000 --- a/ftparchive/apt-ftparchive.cc.orig +++ /dev/null @@ -1,977 +0,0 @@ -extern "C" { - #include -} - -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ -/* ###################################################################### - - apt-scanpackages - Efficient work-alike for dpkg-scanpackages - - Let contents be disabled from the conf - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-ftparchive.h" -#endif - -#include "apt-ftparchive.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "contents.h" -#include "multicompress.h" -#include "writer.h" - /*}}}*/ - -using namespace std; -ostream c0out(0); -ostream c1out(0); -ostream c2out(0); -ofstream devnull("/dev/null"); -unsigned Quiet = 0; - -// struct PackageMap - List of all package files in the config file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -struct PackageMap -{ - // General Stuff - string BaseDir; - string InternalPrefix; - string FLFile; - string PkgExt; - string SrcExt; - - // Stuff for the Package File - string PkgFile; - string BinCacheDB; - string BinOverride; - string ExtraOverride; - - // We generate for this given arch - string Arch; - - // Stuff for the Source File - string SrcFile; - string SrcOverride; - string SrcExtraOverride; - - // Contents - string Contents; - string ContentsHead; - - // Random things - string Tag; - string PkgCompress; - string CntCompress; - string SrcCompress; - string PathPrefix; - unsigned int DeLinkLimit; - mode_t Permissions; - - bool ContentsDone; - bool PkgDone; - bool SrcDone; - time_t ContentsMTime; - - struct ContentsCompare : public binary_function - { - inline bool operator() (const PackageMap &x,const PackageMap &y) - {return x.ContentsMTime < y.ContentsMTime;}; - }; - - struct DBCompare : public binary_function - { - inline bool operator() (const PackageMap &x,const PackageMap &y) - {return x.BinCacheDB < y.BinCacheDB;}; - }; - - void GetGeneral(Configuration &Setup,Configuration &Block); - bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats); - bool GenSources(Configuration &Setup,struct CacheDB::Stats &Stats); - bool GenContents(Configuration &Setup, - vector::iterator Begin, - vector::iterator End, - unsigned long &Left); - - PackageMap() : DeLinkLimit(0), Permissions(1), ContentsDone(false), - PkgDone(false), SrcDone(false), ContentsMTime(0) {}; -}; - /*}}}*/ - -// PackageMap::GetGeneral - Common per-section definitions /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block) -{ - PathPrefix = Block.Find("PathPrefix"); - - if (Block.FindB("External-Links",true) == false) - DeLinkLimit = Setup.FindI("Default::DeLinkLimit",UINT_MAX); - else - DeLinkLimit = 0; - - PkgCompress = Block.Find("Packages::Compress", - Setup.Find("Default::Packages::Compress",". gzip").c_str()); - CntCompress = Block.Find("Contents::Compress", - Setup.Find("Default::Contents::Compress",". gzip").c_str()); - SrcCompress = Block.Find("Sources::Compress", - Setup.Find("Default::Sources::Compress",". gzip").c_str()); - - SrcExt = Block.Find("Sources::Extensions", - Setup.Find("Default::Sources::Extensions",".dsc").c_str()); - PkgExt = Block.Find("Packages::Extensions", - Setup.Find("Default::Packages::Extensions",".deb").c_str()); - - Permissions = Setup.FindI("Default::FileMode",0644); - - if (FLFile.empty() == false) - FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile); - - if (Contents == " ") - Contents= string(); -} - /*}}}*/ -// PackageMap::GenPackages - Actually generate a Package file /*{{{*/ -// --------------------------------------------------------------------- -/* This generates the Package File described by this object. */ -bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) -{ - if (PkgFile.empty() == true) - return true; - - string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); - string OverrideDir = Setup.FindDir("Dir::OverrideDir"); - string CacheDir = Setup.FindDir("Dir::CacheDir"); - - struct timeval StartTime; - gettimeofday(&StartTime,0); - - PkgDone = true; - - // Create a package writer object. - PackagesWriter Packages(flCombine(CacheDir,BinCacheDB), - flCombine(OverrideDir,BinOverride), - flCombine(OverrideDir,ExtraOverride), - Arch); - if (PkgExt.empty() == false && Packages.SetExts(PkgExt) == false) - return _error->Error(_("Package extension list is too long")); - if (_error->PendingError() == true) - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - - Packages.PathPrefix = PathPrefix; - Packages.DirStrip = ArchiveDir; - Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); - - Packages.Stats.DeLinkBytes = Stats.DeLinkBytes; - Packages.DeLinkLimit = DeLinkLimit; - - // Create a compressor object - MultiCompress Comp(flCombine(ArchiveDir,PkgFile), - PkgCompress,Permissions); - Packages.Output = Comp.Input; - if (_error->PendingError() == true) - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - - c0out << ' ' << BaseDir << ":" << flush; - - // Do recursive directory searching - if (FLFile.empty() == true) - { - if (Packages.RecursiveScan(flCombine(ArchiveDir,BaseDir)) == false) - return false; - } - else - { - if (Packages.LoadFileList(ArchiveDir,FLFile) == false) - return false; - } - - Packages.Output = 0; // Just in case - - // Finish compressing - unsigned long Size; - if (Comp.Finalize(Size) == false) - { - c0out << endl; - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - } - - if (Size != 0) - c0out << " New " - << SizeToStr(Size) << "B "; - else - c0out << ' '; - - struct timeval NewTime; - gettimeofday(&NewTime,0); - double Delta = NewTime.tv_sec - StartTime.tv_sec + - (NewTime.tv_usec - StartTime.tv_usec)/1000000.0; - - c0out << Packages.Stats.Packages << " files " << -/* SizeToStr(Packages.Stats.MD5Bytes) << "B/" << */ - SizeToStr(Packages.Stats.Bytes) << "B " << - TimeToStr((long)Delta) << endl; - - Stats.Add(Packages.Stats); - Stats.DeLinkBytes = Packages.Stats.DeLinkBytes; - - return !_error->PendingError(); -} - - /*}}}*/ -// PackageMap::GenSources - Actually generate a Source file /*{{{*/ -// --------------------------------------------------------------------- -/* This generates the Sources File described by this object. */ -bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats) -{ - if (SrcFile.empty() == true) - return true; - - string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); - string OverrideDir = Setup.FindDir("Dir::OverrideDir"); - string CacheDir = Setup.FindDir("Dir::CacheDir"); - - struct timeval StartTime; - gettimeofday(&StartTime,0); - - SrcDone = true; - - // Create a package writer object. - SourcesWriter Sources(flCombine(OverrideDir,BinOverride), - flCombine(OverrideDir,SrcOverride), - flCombine(OverrideDir,SrcExtraOverride)); - if (SrcExt.empty() == false && Sources.SetExts(SrcExt) == false) - return _error->Error(_("Source extension list is too long")); - if (_error->PendingError() == true) - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - - Sources.PathPrefix = PathPrefix; - Sources.DirStrip = ArchiveDir; - Sources.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); - - Sources.DeLinkLimit = DeLinkLimit; - Sources.Stats.DeLinkBytes = Stats.DeLinkBytes; - - // Create a compressor object - MultiCompress Comp(flCombine(ArchiveDir,SrcFile), - SrcCompress,Permissions); - Sources.Output = Comp.Input; - if (_error->PendingError() == true) - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - - c0out << ' ' << BaseDir << ":" << flush; - - // Do recursive directory searching - if (FLFile.empty() == true) - { - if (Sources.RecursiveScan(flCombine(ArchiveDir,BaseDir))== false) - return false; - } - else - { - if (Sources.LoadFileList(ArchiveDir,FLFile) == false) - return false; - } - Sources.Output = 0; // Just in case - - // Finish compressing - unsigned long Size; - if (Comp.Finalize(Size) == false) - { - c0out << endl; - return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); - } - - if (Size != 0) - c0out << " New " - << SizeToStr(Size) << "B "; - else - c0out << ' '; - - struct timeval NewTime; - gettimeofday(&NewTime,0); - double Delta = NewTime.tv_sec - StartTime.tv_sec + - (NewTime.tv_usec - StartTime.tv_usec)/1000000.0; - - c0out << Sources.Stats.Packages << " pkgs in " << - TimeToStr((long)Delta) << endl; - - Stats.Add(Sources.Stats); - Stats.DeLinkBytes = Sources.Stats.DeLinkBytes; - - return !_error->PendingError(); -} - /*}}}*/ -// PackageMap::GenContents - Actually generate a Contents file /*{{{*/ -// --------------------------------------------------------------------- -/* This generates the contents file partially described by this object. - It searches the given iterator range for other package files that map - into this contents file and includes their data as well when building. */ -bool PackageMap::GenContents(Configuration &Setup, - vector::iterator Begin, - vector::iterator End, - unsigned long &Left) -{ - if (Contents.empty() == true) - return true; - - if (Left == 0) - return true; - - string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); - string CacheDir = Setup.FindDir("Dir::CacheDir"); - string OverrideDir = Setup.FindDir("Dir::OverrideDir"); - - struct timeval StartTime; - gettimeofday(&StartTime,0); - - // Create a package writer object. - ContentsWriter Contents(""); - if (PkgExt.empty() == false && Contents.SetExts(PkgExt) == false) - return _error->Error(_("Package extension list is too long")); - if (_error->PendingError() == true) - return false; - - MultiCompress Comp(flCombine(ArchiveDir,this->Contents), - CntCompress,Permissions); - Comp.UpdateMTime = Setup.FindI("Default::ContentsAge",10)*24*60*60; - Contents.Output = Comp.Input; - if (_error->PendingError() == true) - return false; - - // Write the header out. - if (ContentsHead.empty() == false) - { - FileFd Head(flCombine(OverrideDir,ContentsHead),FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - unsigned long Size = Head.Size(); - unsigned char Buf[4096]; - while (Size != 0) - { - unsigned long ToRead = Size; - if (Size > sizeof(Buf)) - ToRead = sizeof(Buf); - - if (Head.Read(Buf,ToRead) == false) - return false; - - if (fwrite(Buf,1,ToRead,Comp.Input) != ToRead) - return _error->Errno("fwrite",_("Error writing header to contents file")); - - Size -= ToRead; - } - } - - /* Go over all the package file records and parse all the package - files associated with this contents file into one great big honking - memory structure, then dump the sorted version */ - c0out << ' ' << this->Contents << ":" << flush; - for (vector::iterator I = Begin; I != End; I++) - { - if (I->Contents != this->Contents) - continue; - - Contents.Prefix = ArchiveDir; - Contents.ReadyDB(flCombine(CacheDir,I->BinCacheDB)); - Contents.ReadFromPkgs(flCombine(ArchiveDir,I->PkgFile), - I->PkgCompress); - - I->ContentsDone = true; - } - - Contents.Finish(); - - // Finish compressing - unsigned long Size; - if (Comp.Finalize(Size) == false || _error->PendingError() == true) - { - c0out << endl; - return _error->Error(_("Error processing contents %s"), - this->Contents.c_str()); - } - - if (Size != 0) - { - c0out << " New " << SizeToStr(Size) << "B "; - if (Left > Size) - Left -= Size; - else - Left = 0; - } - else - c0out << ' '; - - struct timeval NewTime; - gettimeofday(&NewTime,0); - double Delta = NewTime.tv_sec - StartTime.tv_sec + - (NewTime.tv_usec - StartTime.tv_usec)/1000000.0; - - c0out << Contents.Stats.Packages << " files " << - SizeToStr(Contents.Stats.Bytes) << "B " << - TimeToStr((long)Delta) << endl; - - return true; -} - /*}}}*/ - -// LoadTree - Load a 'tree' section from the Generate Config /*{{{*/ -// --------------------------------------------------------------------- -/* This populates the PkgList with all the possible permutations of the - section/arch lists. */ -void LoadTree(vector &PkgList,Configuration &Setup) -{ - // Load the defaults - string DDir = Setup.Find("TreeDefault::Directory", - "$(DIST)/$(SECTION)/binary-$(ARCH)/"); - string DSDir = Setup.Find("TreeDefault::SrcDirectory", - "$(DIST)/$(SECTION)/source/"); - string DPkg = Setup.Find("TreeDefault::Packages", - "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages"); - string DIPrfx = Setup.Find("TreeDefault::InternalPrefix", - "$(DIST)/$(SECTION)/"); - string DContents = Setup.Find("TreeDefault::Contents", - "$(DIST)/Contents-$(ARCH)"); - string DContentsH = Setup.Find("TreeDefault::Contents::Header",""); - string DBCache = Setup.Find("TreeDefault::BinCacheDB", - "packages-$(ARCH).db"); - string DSources = Setup.Find("TreeDefault::Sources", - "$(DIST)/$(SECTION)/source/Sources"); - string DFLFile = Setup.Find("TreeDefault::FileList", ""); - string DSFLFile = Setup.Find("TreeDefault::SourceFileList", ""); - - // Process 'tree' type sections - const Configuration::Item *Top = Setup.Tree("tree"); - for (Top = (Top == 0?0:Top->Child); Top != 0;) - { - Configuration Block(Top); - string Dist = Top->Tag; - - // Parse the sections - string Tmp = Block.Find("Sections"); - const char *Sections = Tmp.c_str(); - string Section; - while (ParseQuoteWord(Sections,Section) == true) - { - string Tmp2 = Block.Find("Architectures"); - string Arch; - const char *Archs = Tmp2.c_str(); - while (ParseQuoteWord(Archs,Arch) == true) - { - struct SubstVar Vars[] = {{"$(DIST)",&Dist}, - {"$(SECTION)",&Section}, - {"$(ARCH)",&Arch}, - {}}; - PackageMap Itm; - - Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars); - Itm.InternalPrefix = SubstVar(Block.Find("InternalPrefix",DIPrfx.c_str()),Vars); - - if (stringcasecmp(Arch,"source") == 0) - { - Itm.SrcOverride = SubstVar(Block.Find("SrcOverride"),Vars); - Itm.BaseDir = SubstVar(Block.Find("SrcDirectory",DSDir.c_str()),Vars); - Itm.SrcFile = SubstVar(Block.Find("Sources",DSources.c_str()),Vars); - Itm.Tag = SubstVar("$(DIST)/$(SECTION)/source",Vars); - Itm.FLFile = SubstVar(Block.Find("SourceFileList",DSFLFile.c_str()),Vars); - Itm.SrcExtraOverride = SubstVar(Block.Find("SrcExtraOverride"),Vars); - } - else - { - Itm.BinCacheDB = SubstVar(Block.Find("BinCacheDB",DBCache.c_str()),Vars); - Itm.BaseDir = SubstVar(Block.Find("Directory",DDir.c_str()),Vars); - Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); - Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); - Itm.Arch = Arch; - Itm.Contents = SubstVar(Block.Find("Contents",DContents.c_str()),Vars); - Itm.ContentsHead = SubstVar(Block.Find("Contents::Header",DContentsH.c_str()),Vars); - Itm.FLFile = SubstVar(Block.Find("FileList",DFLFile.c_str()),Vars); - Itm.ExtraOverride = SubstVar(Block.Find("ExtraOverride"),Vars); - } - - Itm.GetGeneral(Setup,Block); - PkgList.push_back(Itm); - } - } - - Top = Top->Next; - } -} - /*}}}*/ -// LoadBinDir - Load a 'bindirectory' section from the Generate Config /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void LoadBinDir(vector &PkgList,Configuration &Setup) -{ - // Process 'bindirectory' type sections - const Configuration::Item *Top = Setup.Tree("bindirectory"); - for (Top = (Top == 0?0:Top->Child); Top != 0;) - { - Configuration Block(Top); - - PackageMap Itm; - Itm.PkgFile = Block.Find("Packages"); - Itm.SrcFile = Block.Find("Sources"); - Itm.BinCacheDB = Block.Find("BinCacheDB"); - Itm.BinOverride = Block.Find("BinOverride"); - Itm.ExtraOverride = Block.Find("ExtraOverride"); - Itm.SrcExtraOverride = Block.Find("SrcExtraOverride"); - Itm.SrcOverride = Block.Find("SrcOverride"); - Itm.BaseDir = Top->Tag; - Itm.FLFile = Block.Find("FileList"); - Itm.InternalPrefix = Block.Find("InternalPrefix",Top->Tag.c_str()); - Itm.Contents = Block.Find("Contents"); - Itm.ContentsHead = Block.Find("Contents::Header"); - - Itm.GetGeneral(Setup,Block); - PkgList.push_back(Itm); - - Top = Top->Next; - } -} - /*}}}*/ - -// ShowHelp - Show the help text /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ShowHelp(CommandLine &CmdL) -{ - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); - if (_config->FindB("version") == true) - return true; - - cout << - _("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") << endl; - - return true; -} - /*}}}*/ -// SimpleGenPackages - Generate a Packages file for a directory tree /*{{{*/ -// --------------------------------------------------------------------- -/* This emulates dpkg-scanpackages's command line interface. 'mostly' */ -bool SimpleGenPackages(CommandLine &CmdL) -{ - if (CmdL.FileSize() < 2) - return ShowHelp(CmdL); - - string Override; - if (CmdL.FileSize() >= 3) - Override = CmdL.FileList[2]; - - // Create a package writer object. - PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"), - Override, ""); - if (_error->PendingError() == true) - return false; - - if (CmdL.FileSize() >= 4) - Packages.PathPrefix = CmdL.FileList[3]; - - // Do recursive directory searching - if (Packages.RecursiveScan(CmdL.FileList[1]) == false) - return false; - - return true; -} - /*}}}*/ -// SimpleGenContents - Generate a Contents listing /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool SimpleGenContents(CommandLine &CmdL) -{ - if (CmdL.FileSize() < 2) - return ShowHelp(CmdL); - - // Create a package writer object. - ContentsWriter Contents(_config->Find("APT::FTPArchive::DB")); - if (_error->PendingError() == true) - return false; - - // Do recursive directory searching - if (Contents.RecursiveScan(CmdL.FileList[1]) == false) - return false; - - Contents.Finish(); - - return true; -} - /*}}}*/ -// SimpleGenSources - Generate a Sources file for a directory tree /*{{{*/ -// --------------------------------------------------------------------- -/* This emulates dpkg-scanpackages's command line interface. 'mostly' */ -bool SimpleGenSources(CommandLine &CmdL) -{ - if (CmdL.FileSize() < 2) - return ShowHelp(CmdL); - - string Override; - if (CmdL.FileSize() >= 3) - Override = CmdL.FileList[2]; - - string SOverride; - if (Override.empty() == false) - SOverride = Override + ".src"; - - SOverride = _config->Find("APT::FTPArchive::SourceOverride", - SOverride.c_str()); - - // Create a package writer object. - SourcesWriter Sources(Override,SOverride); - if (_error->PendingError() == true) - return false; - - if (CmdL.FileSize() >= 4) - Sources.PathPrefix = CmdL.FileList[3]; - - // Do recursive directory searching - if (Sources.RecursiveScan(CmdL.FileList[1]) == false) - return false; - - return true; -} - /*}}}*/ -// SimpleGenRelease - Generate a Release file for a directory tree /*{{{*/ -// --------------------------------------------------------------------- -bool SimpleGenRelease(CommandLine &CmdL) -{ - if (CmdL.FileSize() < 2) - return ShowHelp(CmdL); - - string Dir = CmdL.FileList[1]; - - ReleaseWriter Release(""); - Release.DirStrip = Dir; - - if (_error->PendingError() == true) - return false; - - if (Release.RecursiveScan(Dir) == false) - return false; - - Release.Finish(); - - return true; -} - - /*}}}*/ -// Generate - Full generate, using a config file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Generate(CommandLine &CmdL) -{ - struct CacheDB::Stats SrcStats; - if (CmdL.FileSize() < 2) - return ShowHelp(CmdL); - - struct timeval StartTime; - gettimeofday(&StartTime,0); - struct CacheDB::Stats Stats; - - // Read the configuration file. - Configuration Setup; - if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false) - return false; - - vector PkgList; - LoadTree(PkgList,Setup); - LoadBinDir(PkgList,Setup); - - // Sort by cache DB to improve IO locality. - stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); - - // Generate packages - if (CmdL.FileSize() <= 2) - { - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) - if (I->GenPackages(Setup,Stats) == false) - _error->DumpErrors(); - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) - if (I->GenSources(Setup,SrcStats) == false) - _error->DumpErrors(); - } - else - { - // Make a choice list out of the package list.. - RxChoiceList *List = new RxChoiceList[2*PkgList.size()+1]; - RxChoiceList *End = List; - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) - { - End->UserData = &(*I); - End->Str = I->BaseDir.c_str(); - End++; - - End->UserData = &(*I); - End->Str = I->Tag.c_str(); - End++; - } - End->Str = 0; - - // Regex it - if (RegexChoice(List,CmdL.FileList + 2,CmdL.FileList + CmdL.FileSize()) == 0) - { - delete [] List; - return _error->Error(_("No selections matched")); - } - _error->DumpErrors(); - - // Do the generation for Packages - for (End = List; End->Str != 0; End++) - { - if (End->Hit == false) - continue; - - PackageMap *I = (PackageMap *)End->UserData; - if (I->PkgDone == true) - continue; - if (I->GenPackages(Setup,Stats) == false) - _error->DumpErrors(); - } - - // Do the generation for Sources - for (End = List; End->Str != 0; End++) - { - if (End->Hit == false) - continue; - - PackageMap *I = (PackageMap *)End->UserData; - if (I->SrcDone == true) - continue; - if (I->GenSources(Setup,SrcStats) == false) - _error->DumpErrors(); - } - - delete [] List; - } - - if (_config->FindB("APT::FTPArchive::Contents",true) == false) - return true; - - c1out << "Done Packages, Starting contents." << endl; - - // Sort the contents file list by date - string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) - { - struct stat A; - if (MultiCompress::GetStat(flCombine(ArchiveDir,I->Contents), - I->CntCompress,A) == false) - time(&I->ContentsMTime); - else - I->ContentsMTime = A.st_mtime; - } - stable_sort(PkgList.begin(),PkgList.end(),PackageMap::ContentsCompare()); - - /* Now for Contents.. The process here is to do a make-like dependency - check. Each contents file is verified to be newer than the package files - that describe the debs it indexes. Since the package files contain - hashes of the .debs this means they have not changed either so the - contents must be up to date. */ - unsigned long MaxContentsChange = Setup.FindI("Default::MaxContentsChange",UINT_MAX)*1024; - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) - { - // This record is not relevent - if (I->ContentsDone == true || - I->Contents.empty() == true) - continue; - - // Do not do everything if the user specified sections. - if (CmdL.FileSize() > 2 && I->PkgDone == false) - continue; - - struct stat A,B; - if (MultiCompress::GetStat(flCombine(ArchiveDir,I->Contents),I->CntCompress,A) == true) - { - if (MultiCompress::GetStat(flCombine(ArchiveDir,I->PkgFile),I->PkgCompress,B) == false) - { - _error->Warning(_("Some files are missing in the package file group `%s'"),I->PkgFile.c_str()); - continue; - } - - if (A.st_mtime > B.st_mtime) - continue; - } - - if (I->GenContents(Setup,PkgList.begin(),PkgList.end(), - MaxContentsChange) == false) - _error->DumpErrors(); - - // Hit the limit? - if (MaxContentsChange == 0) - { - c1out << "Hit contents update byte limit" << endl; - break; - } - } - - struct timeval NewTime; - gettimeofday(&NewTime,0); - double Delta = NewTime.tv_sec - StartTime.tv_sec + - (NewTime.tv_usec - StartTime.tv_usec)/1000000.0; - c1out << "Done. " << SizeToStr(Stats.Bytes) << "B in " << Stats.Packages - << " archives. Took " << TimeToStr((long)Delta) << endl; - - return true; -} - /*}}}*/ -// Clean - Clean out the databases /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Clean(CommandLine &CmdL) -{ - if (CmdL.FileSize() != 2) - return ShowHelp(CmdL); - - // Read the configuration file. - Configuration Setup; - if (ReadConfigFile(Setup,CmdL.FileList[1],true) == false) - return false; - - vector PkgList; - LoadTree(PkgList,Setup); - LoadBinDir(PkgList,Setup); - - // Sort by cache DB to improve IO locality. - stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); - - string CacheDir = Setup.FindDir("Dir::CacheDir"); - - for (vector::iterator I = PkgList.begin(); I != PkgList.end(); ) - { - c0out << I->BinCacheDB << endl; - CacheDB DB(flCombine(CacheDir,I->BinCacheDB)); - if (DB.Clean() == false) - _error->DumpErrors(); - - string CacheDB = I->BinCacheDB; - for (; I != PkgList.end() && I->BinCacheDB == CacheDB; I++); - } - - return true; -} - /*}}}*/ - -int main(int argc, const char *argv[]) -{ -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - - CommandLine::Args Args[] = { - {'h',"help","help",0}, - {0,"md5","APT::FTPArchive::MD5",0}, - {'v',"version","version",0}, - {'d',"db","APT::FTPArchive::DB",CommandLine::HasArg}, - {'s',"source-override","APT::FTPArchive::SourceOverride",CommandLine::HasArg}, - {'q',"quiet","quiet",CommandLine::IntLevel}, - {'q',"silent","quiet",CommandLine::IntLevel}, - {0,"delink","APT::FTPArchive::DeLinkAct",0}, - {0,"readonly","APT::FTPArchive::ReadOnlyDB",0}, - {0,"contents","APT::FTPArchive::Contents",0}, - {'c',"config-file",0,CommandLine::ConfigFile}, - {'o',"option",0,CommandLine::ArbItem}, - {0,0,0,0}}; - CommandLine::Dispatch Cmds[] = {{"packages",&SimpleGenPackages}, - {"contents",&SimpleGenContents}, - {"sources",&SimpleGenSources}, - {"release",&SimpleGenRelease}, - {"generate",&Generate}, - {"clean",&Clean}, - {"help",&ShowHelp}, - {0,0}}; - - // Parse the command line and initialize the package library - CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false) - { - _error->DumpErrors(); - return 100; - } - - // See if the help should be shown - if (_config->FindB("help") == true || - _config->FindB("version") == true || - CmdL.FileSize() == 0) - { - ShowHelp(CmdL); - return 0; - } - - // Setup the output streams - c0out.rdbuf(clog.rdbuf()); - c1out.rdbuf(clog.rdbuf()); - c2out.rdbuf(clog.rdbuf()); - Quiet = _config->FindI("quiet",0); - if (Quiet > 0) - c0out.rdbuf(devnull.rdbuf()); - if (Quiet > 1) - c1out.rdbuf(devnull.rdbuf()); - - // Match the operation - CmdL.DispatchArg(Cmds); - - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); - _error->DumpErrors(); - return Errors == true?100:0; - } - return 0; -} diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h index c364d67..240cf9b 100644 --- a/ftparchive/apt-ftparchive.h +++ b/ftparchive/apt-ftparchive.h @@ -13,9 +13,6 @@ #ifndef APT_FTPARCHIVE_H #define APT_FTPARCHIVE_H -#ifdef __GNUG__ -#pragma interface "apt-ftparchive.h" -#endif #include diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index d56a468..7fea40c 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "cachedb.h" -#endif - #include "cachedb.h" #include diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index afa2221..c10f41e 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,9 +12,7 @@ #ifndef CACHEDB_H #define CACHEDB_H -#ifdef __GNUG__ -#pragma interface "cachedb.h" -#endif + #include #include diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 9efef97..f0162d5 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -314,7 +314,12 @@ bool ContentsExtract::Read(debDebFile &Deb) Compressor = "bzip2"; } if (Member == 0) { - _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz"); + Member = Deb.GotoMember("data.tar.lzma"); + Compressor = "lzma"; + } + if (Member == 0) { + _error->Error(_("Internal error, could not locate member %s"), + "data.tar.{gz,bz2,lzma}"); return false; } diff --git a/ftparchive/makefile b/ftparchive/makefile index a965166..504ebf8 100644 --- a/ftparchive/makefile +++ b/ftparchive/makefile @@ -8,7 +8,7 @@ include ../buildlib/defaults.mak # The apt-ftparchive program ifdef BDBLIB PROGRAM=apt-ftparchive -SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) +SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS) LIB_MAKES = apt-pkg/makefile apt-inst/makefile SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \ multicompress.cc diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index a3512c7..2fc8efc 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -14,10 +14,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "multicompress.h" -#endif - #include "multicompress.h" #include @@ -38,6 +34,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] = {{".","",0,0,0,1}, {"gzip",".gz","gzip","-9n","-d",2}, {"bzip2",".bz2","bzip2","-9","-d",3}, + {"lzma",".lzma","lzma","-9","-d",4}, {}}; // MultiCompress::MultiCompress - Constructor /*{{{*/ diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 444d862..a65077e 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -16,9 +16,7 @@ #ifndef MULTICOMPRESS_H #define MULTICOMPRESS_H -#ifdef __GNUG__ -#pragma interface "multicompress.h" -#endif + #include #include diff --git a/ftparchive/override.cc b/ftparchive/override.cc index b8b9484..6f40bc8 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "override.h" -#endif - #include "override.h" #include diff --git a/ftparchive/override.h b/ftparchive/override.h index e646417..f270556 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -12,9 +12,7 @@ #ifndef OVERRIDE_H #define OVERRIDE_H -#ifdef __GNUG__ -#pragma interface "override.h" -#endif + #include #include diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index ea242d6..9d248ab 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -11,10 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "writer.h" -#endif - #include "writer.h" #include @@ -32,6 +28,7 @@ #include #include #include +#include #include "cachedb.h" #include "apt-ftparchive.h" diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 1d47d57..a4e4356 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -13,9 +13,6 @@ #ifndef WRITER_H #define WRITER_H -#ifdef __GNUG__ -#pragma interface "writer.h" -#endif #include #include diff --git a/methods/cdrom.cc b/methods/cdrom.cc index f6546aa..601bc11 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -34,7 +30,7 @@ class CDROMMethod : public pkgAcqMethod ::Configuration Database; string CurrentID; string CDROM; - bool Mounted; + bool MountedByApt; virtual bool Fetch(FetchItem *Itm); string GetID(string Name); @@ -52,7 +48,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | SendConfig | NeedsCleanup | Removable), DatabaseLoaded(false), - Mounted(false) + MountedByApt(false) { }; /*}}}*/ @@ -61,7 +57,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | /* */ void CDROMMethod::Exit() { - if (Mounted == true) + if (MountedByApt == true) UnmountCdrom(CDROM); } /*}}}*/ @@ -143,7 +139,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) while (CurrentID.empty() == true) { bool Hit = false; - Mounted = MountCdrom(CDROM); + if(!IsMounted(CDROM)) + MountedByApt = MountCdrom(CDROM); for (unsigned int Version = 2; Version != 0; Version--) { if (IdentCdrom(CDROM,NewID,Version) == false) @@ -164,7 +161,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) break; // I suppose this should prompt somehow? - if (UnmountCdrom(CDROM) == false) + if (_config->FindB("APT::CDROM::NoMount",false) == false && + UnmountCdrom(CDROM) == false) return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."), CDROM.c_str()); if (MediaFail(Get.Host,CDROM) == false) @@ -197,15 +195,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm) int main() { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); CDROMMethod Mth; diff --git a/methods/connect.cc b/methods/connect.cc index 8c2ac6d..355bd5c 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -19,6 +19,9 @@ #include #include +#include +#include + // Internet stuff #include #include @@ -34,6 +37,9 @@ static int LastPort = 0; static struct addrinfo *LastHostAddr = 0; static struct addrinfo *LastUsed = 0; +// Set of IP/hostnames that we timed out before or couldn't resolve +static std::set bad_addr; + // RotateDNS - Select a new server from a DNS rotation /*{{{*/ // --------------------------------------------------------------------- /* This is called during certain errors in order to recover by selecting a @@ -63,6 +69,10 @@ static bool DoConnect(struct addrinfo *Addr,string Host, NI_NUMERICHOST|NI_NUMERICSERV); Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name); + // if that addr did timeout before, we do not try it again + if(bad_addr.find(string(Name)) != bad_addr.end()) + return false; + /* If this is an IP rotation store the IP we are using.. If something goes wrong this will get tacked onto the end of the error message */ if (LastHostAddr->ai_next != 0) @@ -89,6 +99,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host, /* This implements a timeout for connect by opening the connection nonblocking */ if (WaitFd(Fd,true,TimeOut) == false) { + bad_addr.insert(bad_addr.begin(), string(Name)); Owner->SetFailExtraMsg("\nFailReason: Timeout"); return _error->Error(_("Could not connect to %s:%s (%s), " "connection timed out"),Host.c_str(),Service,Name); @@ -149,6 +160,10 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, Hints.ai_socktype = SOCK_STREAM; Hints.ai_protocol = 0; + // if we couldn't resolve the host before, we don't try now + if(bad_addr.find(Host) != bad_addr.end()) + return _error->Error(_("Could not resolve '%s'"),Host.c_str()); + // Resolve both the host and service simultaneously while (1) { @@ -164,6 +179,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, DefPort = 0; continue; } + bad_addr.insert(bad_addr.begin(), Host); + Owner->SetFailExtraMsg("\nFailReason: ResolveFailure"); return _error->Error(_("Could not resolve '%s'"),Host.c_str()); } diff --git a/methods/copy.cc b/methods/copy.cc index 48aa5ab..72896b4 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: copy.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -16,6 +12,7 @@ extern "C" { #include #include #include +#include #include #include @@ -83,6 +80,10 @@ bool CopyMethod::Fetch(FetchItem *Itm) return _error->Errno("utime",_("Failed to set modification time")); } + Hashes Hash; + FileFd Fd(Res.Filename, FileFd::ReadOnly); + Hash.AddFD(Fd.Fd(), Fd.Size()); + Res.TakeHashes(Hash); URIDone(Res); return true; } @@ -90,15 +91,6 @@ bool CopyMethod::Fetch(FetchItem *Itm) int main() { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); CopyMethod Mth; diff --git a/methods/file.cc b/methods/file.cc index 5370f5c..9cdd5bc 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -93,15 +89,6 @@ bool FileMethod::Fetch(FetchItem *Itm) int main() { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); FileMethod Mth; diff --git a/methods/ftp.cc b/methods/ftp.cc index 125907a..554a24c 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -1090,15 +1086,6 @@ bool FtpMethod::Fetch(FetchItem *Itm) int main(int argc,const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); /* See if we should be come the http client - we do this for http @@ -1114,7 +1101,7 @@ int main(int argc,const char *argv[]) char S[300]; snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy")); putenv(S); - putenv("no_proxy="); + putenv((char *)"no_proxy="); // Run the http method string Path = flNotFile(argv[0]) + "http"; diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 730a1bb..9f4683e 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - #include #include #include @@ -87,6 +83,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = gpgvpath.c_str(); Args[i++] = "--status-fd"; Args[i++] = "3"; + Args[i++] = "--ignore-time-conflict"; Args[i++] = "--keyring"; Args[i++] = pubringpath.c_str(); @@ -125,9 +122,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, // Redirect the pipe to the status fd (3) dup2(fd[1], 3); - putenv("LANG="); - putenv("LC_ALL="); - putenv("LC_MESSAGES="); + putenv((char *)"LANG="); + putenv((char *)"LC_ALL="); + putenv((char *)"LC_MESSAGES="); execvp(gpgvpath.c_str(), (char **)Args); exit(111); @@ -214,7 +211,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str()); + ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str()); return ret.str(); } else @@ -270,23 +267,6 @@ bool GPGVMethod::Fetch(FetchItem *Itm) return _error->Error(errmsg.c_str()); } - // Transfer the modification times - struct stat Buf; - if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat %s"), Path.c_str()); - - struct utimbuf TimeBuf; - TimeBuf.actime = Buf.st_atime; - TimeBuf.modtime = Buf.st_mtime; - if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime",_("Failed to set modification time")); - - if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); - - // Return a Done response - Res.LastModified = Buf.st_mtime; - Res.Size = Buf.st_size; // Just pass the raw output up, because passing it as a real data // structure is too difficult with the method stuff. We keep it // as three separate vectors for future extensibility. @@ -306,15 +286,6 @@ bool GPGVMethod::Fetch(FetchItem *Itm) int main() { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); GPGVMethod Mth; diff --git a/methods/gzip.cc b/methods/gzip.cc index dfca493..f732c0b 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -166,15 +162,6 @@ bool GzipMethod::Fetch(FetchItem *Itm) int main(int argc, char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); GzipMethod Mth; diff --git a/methods/http.cc b/methods/http.cc index 7df6f93..2c25e50 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1,13 +1,9 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - HTTP Aquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP aquire method for APT. It uses HTTP/1.1 and many of the fancy options there-in, such as pipelining, range, if-range and so on. @@ -56,6 +52,7 @@ extern "C" { #include #include +#include "config.h" #include "connect.h" #include "rfc2553emu.h" #include "http.h" @@ -114,6 +111,7 @@ time_t HttpMethod::FailTime = 0; unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; +URI Proxy; unsigned long CircleBuf::BwReadLimit=0; unsigned long CircleBuf::BwTickReadData=0; @@ -423,8 +421,8 @@ bool ServerState::Close() /*}}}*/ // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- -/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header - parse error occured */ +/* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header + parse error occurred */ int ServerState::RunHeaders() { State = Header; @@ -815,7 +813,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n"; + Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; if (Debug == true) cerr << Req << endl; @@ -1041,7 +1039,8 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) if (Srv->StartPos >= 0) { Res.ResumePoint = Srv->StartPos; - ftruncate(File->Fd(),Srv->StartPos); + if (ftruncate(File->Fd(),Srv->StartPos) < 0) + _error->Errno("ftruncate", _("Failed to truncate file")); } // Set the start point @@ -1096,7 +1095,6 @@ bool HttpMethod::Fetch(FetchItem *) // Queue the requests int Depth = -1; - bool Tail = false; for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; I = I->Next, Depth++) { @@ -1108,8 +1106,6 @@ bool HttpMethod::Fetch(FetchItem *) if (Server->Comp(I->Uri) == false) break; if (QueueBack == I) - Tail = true; - if (Tail == true) { QueueBack = I->Next; SendReq(I,Server->Out); @@ -1166,7 +1162,7 @@ int HttpMethod::Loop() if (Queue == 0) continue; - + CFStringEncoding se = kCFStringEncodingUTF8; char *url = strdup(Queue->Uri.c_str()); @@ -1483,15 +1479,6 @@ int HttpMethod::Loop() int main() { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); HttpMethod Mth; diff --git a/methods/http.cc.orig b/methods/http.cc.orig deleted file mode 100644 index b720a07..0000000 --- a/methods/http.cc.orig +++ /dev/null @@ -1,1517 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ -/* ###################################################################### - - HTTP Aquire Method - This is the HTTP aquire method for APT. - - It uses HTTP/1.1 and many of the fancy options there-in, such as - pipelining, range, if-range and so on. - - It is based on a doubly buffered select loop. A groupe of requests are - fed into a single output buffer that is constantly fed out the - socket. This provides ideal pipelining as in many cases all of the - requests will fit into a single packet. The input socket is buffered - the same way and fed into the fd for the file (may be a pipe in future). - - This double buffering provides fairly substantial transfer rates, - compared to wget the http method is about 4% faster. Most importantly, - when HTTP is compared with FTP as a protocol the speed difference is - huge. In tests over the internet from two sites to llug (via ATM) this - program got 230k/s sustained http transfer rates. FTP on the other - hand topped out at 170k/s. That combined with the time to setup the - FTP connection makes HTTP a vastly superior protocol. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// Internet stuff -#include -#include - -#include -#include -#include -#include - -#include "connect.h" -#include "rfc2553emu.h" -#include "http.h" - - /*}}}*/ -using namespace std; - -CFStringRef Firmware_; -const char *Machine_; -CFStringRef UniqueID_; - -void CfrsError(const char *name, CFReadStreamRef rs) { - CFStreamError se = CFReadStreamGetError(rs); - - if (se.domain == kCFStreamErrorDomainCustom) { - } else if (se.domain == kCFStreamErrorDomainPOSIX) { - _error->Error("POSIX: %s", strerror(se.error)); - } else if (se.domain == kCFStreamErrorDomainMacOSStatus) { - _error->Error("MacOSStatus: %ld", se.error); - } else if (se.domain == kCFStreamErrorDomainNetDB) { - _error->Error("NetDB: %s %s", name, gai_strerror(se.error)); - } else if (se.domain == kCFStreamErrorDomainMach) { - _error->Error("Mach: %ld", se.error); - } else if (se.domain == kCFStreamErrorDomainHTTP) { - switch (se.error) { - case kCFStreamErrorHTTPParseFailure: - _error->Error("Parse failure"); - break; - - case kCFStreamErrorHTTPRedirectionLoop: - _error->Error("Redirection loop"); - break; - - case kCFStreamErrorHTTPBadURL: - _error->Error("Bad URL"); - break; - - default: - _error->Error("Unknown HTTP error: %ld", se.error); - break; - } - } else if (se.domain == kCFStreamErrorDomainSOCKS) { - _error->Error("SOCKS: %ld", se.error); - } else if (se.domain == kCFStreamErrorDomainSystemConfiguration) { - _error->Error("SystemConfiguration: %ld", se.error); - } else if (se.domain == kCFStreamErrorDomainSSL) { - _error->Error("SSL: %ld", se.error); - } else { - _error->Error("Domain #%ld: %ld", se.domain, se.error); - } -} - -string HttpMethod::FailFile; -int HttpMethod::FailFd = -1; -time_t HttpMethod::FailTime = 0; -unsigned long PipelineDepth = 10; -unsigned long TimeOut = 120; -bool Debug = false; - -unsigned long CircleBuf::BwReadLimit=0; -unsigned long CircleBuf::BwTickReadData=0; -struct timeval CircleBuf::BwReadTick={0,0}; -const unsigned int CircleBuf::BW_HZ=10; - -// CircleBuf::CircleBuf - Circular input buffer /*{{{*/ -// --------------------------------------------------------------------- -/* */ -CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) -{ - Buf = new unsigned char[Size]; - Reset(); - - CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; -} - /*}}}*/ -// CircleBuf::Reset - Reset to the default state /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void CircleBuf::Reset() -{ - InP = 0; - OutP = 0; - StrPos = 0; - MaxGet = (unsigned int)-1; - OutQueue = string(); - if (Hash != 0) - { - delete Hash; - Hash = new Hashes; - } -}; - /*}}}*/ -// CircleBuf::Read - Read from a FD into the circular buffer /*{{{*/ -// --------------------------------------------------------------------- -/* This fills up the buffer with as much data as is in the FD, assuming it - is non-blocking.. */ -bool CircleBuf::Read(int Fd) -{ - unsigned long BwReadMax; - - while (1) - { - // Woops, buffer is full - if (InP - OutP == Size) - return true; - - // what's left to read in this tick - BwReadMax = CircleBuf::BwReadLimit/BW_HZ; - - if(CircleBuf::BwReadLimit) { - struct timeval now; - gettimeofday(&now,0); - - unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + - now.tv_usec-CircleBuf::BwReadTick.tv_usec; - if(d > 1000000/BW_HZ) { - CircleBuf::BwReadTick = now; - CircleBuf::BwTickReadData = 0; - } - - if(CircleBuf::BwTickReadData >= BwReadMax) { - usleep(1000000/BW_HZ); - return true; - } - } - - // Write the buffer segment - int Res; - if(CircleBuf::BwReadLimit) { - Res = read(Fd,Buf + (InP%Size), - BwReadMax > LeftRead() ? LeftRead() : BwReadMax); - } else - Res = read(Fd,Buf + (InP%Size),LeftRead()); - - if(Res > 0 && BwReadLimit > 0) - CircleBuf::BwTickReadData += Res; - - if (Res == 0) - return false; - if (Res < 0) - { - if (errno == EAGAIN) - return true; - return false; - } - - if (InP == 0) - gettimeofday(&Start,0); - InP += Res; - } -} - /*}}}*/ -// CircleBuf::Read - Put the string into the buffer /*{{{*/ -// --------------------------------------------------------------------- -/* This will hold the string in and fill the buffer with it as it empties */ -bool CircleBuf::Read(string Data) -{ - OutQueue += Data; - FillOut(); - return true; -} - /*}}}*/ -// CircleBuf::FillOut - Fill the buffer from the output queue /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void CircleBuf::FillOut() -{ - if (OutQueue.empty() == true) - return; - while (1) - { - // Woops, buffer is full - if (InP - OutP == Size) - return; - - // Write the buffer segment - unsigned long Sz = LeftRead(); - if (OutQueue.length() - StrPos < Sz) - Sz = OutQueue.length() - StrPos; - memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz); - - // Advance - StrPos += Sz; - InP += Sz; - if (OutQueue.length() == StrPos) - { - StrPos = 0; - OutQueue = ""; - return; - } - } -} - /*}}}*/ -// CircleBuf::Write - Write from the buffer into a FD /*{{{*/ -// --------------------------------------------------------------------- -/* This empties the buffer into the FD. */ -bool CircleBuf::Write(int Fd) -{ - while (1) - { - FillOut(); - - // Woops, buffer is empty - if (OutP == InP) - return true; - - if (OutP == MaxGet) - return true; - - // Write the buffer segment - int Res; - Res = write(Fd,Buf + (OutP%Size),LeftWrite()); - - if (Res == 0) - return false; - if (Res < 0) - { - if (errno == EAGAIN) - return true; - - return false; - } - - if (Hash != 0) - Hash->Add(Buf + (OutP%Size),Res); - - OutP += Res; - } -} - /*}}}*/ -// CircleBuf::WriteTillEl - Write from the buffer to a string /*{{{*/ -// --------------------------------------------------------------------- -/* This copies till the first empty line */ -bool CircleBuf::WriteTillEl(string &Data,bool Single) -{ - // We cheat and assume it is unneeded to have more than one buffer load - for (unsigned long I = OutP; I < InP; I++) - { - if (Buf[I%Size] != '\n') - continue; - ++I; - - if (Single == false) - { - if (I < InP && Buf[I%Size] == '\r') - ++I; - if (I >= InP || Buf[I%Size] != '\n') - continue; - ++I; - } - - Data = ""; - while (OutP < I) - { - unsigned long Sz = LeftWrite(); - if (Sz == 0) - return false; - if (I - OutP < Sz) - Sz = I - OutP; - Data += string((char *)(Buf + (OutP%Size)),Sz); - OutP += Sz; - } - return true; - } - return false; -} - /*}}}*/ -// CircleBuf::Stats - Print out stats information /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void CircleBuf::Stats() -{ - if (InP == 0) - return; - - struct timeval Stop; - gettimeofday(&Stop,0); -/* float Diff = Stop.tv_sec - Start.tv_sec + - (float)(Stop.tv_usec - Start.tv_usec)/1000000; - clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/ -} - /*}}}*/ - -// ServerState::ServerState - Constructor /*{{{*/ -// --------------------------------------------------------------------- -/* */ -ServerState::ServerState(URI Srv,HttpMethod *Owner) : Owner(Owner), - In(64*1024), Out(4*1024), - ServerName(Srv) -{ - Reset(); -} - /*}}}*/ -// ServerState::Open - Open a connection to the server /*{{{*/ -// --------------------------------------------------------------------- -/* This opens a connection to the server. */ -bool ServerState::Open() -{ - // Use the already open connection if possible. - if (ServerFd != -1) - return true; - - Close(); - In.Reset(); - Out.Reset(); - Persistent = true; - - // Determine the proxy setting - if (getenv("http_proxy") == 0) - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (SpecificProxy.empty() == false) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - Proxy = DefProxy; - } - else - Proxy = getenv("http_proxy"); - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - int Port = 0; - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - if (ServerName.Port != 0) - Port = ServerName.Port; - Host = ServerName.Host; - } - else - { - if (Proxy.Port != 0) - Port = Proxy.Port; - Host = Proxy.Host; - } - - // Connect to the remote server - if (Connect(Host,Port,"http",80,ServerFd,TimeOut,Owner) == false) - return false; - - return true; -} - /*}}}*/ -// ServerState::Close - Close a connection to the server /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ServerState::Close() -{ - close(ServerFd); - ServerFd = -1; - return true; -} - /*}}}*/ -// ServerState::RunHeaders - Get the headers before the data /*{{{*/ -// --------------------------------------------------------------------- -/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header - parse error occured */ -int ServerState::RunHeaders() -{ - State = Header; - - Owner->Status(_("Waiting for headers")); - - Major = 0; - Minor = 0; - Result = 0; - Size = 0; - StartPos = 0; - Encoding = Closes; - HaveContent = false; - time(&Date); - - do - { - string Data; - if (In.WriteTillEl(Data) == false) - continue; - - if (Debug == true) - clog << Data; - - for (string::const_iterator I = Data.begin(); I < Data.end(); I++) - { - string::const_iterator J = I; - for (; J != Data.end() && *J != '\n' && *J != '\r';J++); - if (HeaderLine(string(I,J)) == false) - return 2; - I = J; - } - - // 100 Continue is a Nop... - if (Result == 100) - continue; - - // Tidy up the connection persistance state. - if (Encoding == Closes && HaveContent == true) - Persistent = false; - - return 0; - } - while (Owner->Go(false,this) == true); - - return 1; -} - /*}}}*/ -// ServerState::RunData - Transfer the data from the socket /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ServerState::RunData() -{ - State = Data; - - // Chunked transfer encoding is fun.. - if (Encoding == Chunked) - { - while (1) - { - // Grab the block size - bool Last = true; - string Data; - In.Limit(-1); - do - { - if (In.WriteTillEl(Data,true) == true) - break; - } - while ((Last = Owner->Go(false,this)) == true); - - if (Last == false) - return false; - - // See if we are done - unsigned long Len = strtol(Data.c_str(),0,16); - if (Len == 0) - { - In.Limit(-1); - - // We have to remove the entity trailer - Last = true; - do - { - if (In.WriteTillEl(Data,true) == true && Data.length() <= 2) - break; - } - while ((Last = Owner->Go(false,this)) == true); - if (Last == false) - return false; - return !_error->PendingError(); - } - - // Transfer the block - In.Limit(Len); - while (Owner->Go(true,this) == true) - if (In.IsLimit() == true) - break; - - // Error - if (In.IsLimit() == false) - return false; - - // The server sends an extra new line before the next block specifier.. - In.Limit(-1); - Last = true; - do - { - if (In.WriteTillEl(Data,true) == true) - break; - } - while ((Last = Owner->Go(false,this)) == true); - if (Last == false) - return false; - } - } - else - { - /* Closes encoding is used when the server did not specify a size, the - loss of the connection means we are done */ - if (Encoding == Closes) - In.Limit(-1); - else - In.Limit(Size - StartPos); - - // Just transfer the whole block. - do - { - if (In.IsLimit() == false) - continue; - - In.Limit(-1); - return !_error->PendingError(); - } - while (Owner->Go(true,this) == true); - } - - return Owner->Flush(this) && !_error->PendingError(); -} - /*}}}*/ -// ServerState::HeaderLine - Process a header line /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool ServerState::HeaderLine(string Line) -{ - if (Line.empty() == true) - return true; - - // The http server might be trying to do something evil. - if (Line.length() >= MAXLEN) - return _error->Error(_("Got a single header line over %u chars"),MAXLEN); - - string::size_type Pos = Line.find(' '); - if (Pos == string::npos || Pos+1 > Line.length()) - { - // Blah, some servers use "connection:closes", evil. - Pos = Line.find(':'); - if (Pos == string::npos || Pos + 2 > Line.length()) - return _error->Error(_("Bad header line")); - Pos++; - } - - // Parse off any trailing spaces between the : and the next word. - string::size_type Pos2 = Pos; - while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0) - Pos2++; - - string Tag = string(Line,0,Pos); - string Val = string(Line,Pos2); - - if (stringcasecmp(Tag.c_str(),Tag.c_str()+4,"HTTP") == 0) - { - // Evil servers return no version - if (Line[4] == '/') - { - if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor, - &Result,Code) != 4) - return _error->Error(_("The HTTP server sent an invalid reply header")); - } - else - { - Major = 0; - Minor = 9; - if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2) - return _error->Error(_("The HTTP server sent an invalid reply header")); - } - - /* Check the HTTP response header to get the default persistance - state. */ - if (Major < 1) - Persistent = false; - else - { - if (Major == 1 && Minor <= 0) - Persistent = false; - else - Persistent = true; - } - - return true; - } - - if (stringcasecmp(Tag,"Content-Length:") == 0) - { - if (Encoding == Closes) - Encoding = Stream; - HaveContent = true; - - // The length is already set from the Content-Range header - if (StartPos != 0) - return true; - - if (sscanf(Val.c_str(),"%lu",&Size) != 1) - return _error->Error(_("The HTTP server sent an invalid Content-Length header")); - return true; - } - - if (stringcasecmp(Tag,"Content-Type:") == 0) - { - HaveContent = true; - return true; - } - - if (stringcasecmp(Tag,"Content-Range:") == 0) - { - HaveContent = true; - - if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2) - return _error->Error(_("The HTTP server sent an invalid Content-Range header")); - if ((unsigned)StartPos > Size) - return _error->Error(_("This HTTP server has broken range support")); - return true; - } - - if (stringcasecmp(Tag,"Transfer-Encoding:") == 0) - { - HaveContent = true; - if (stringcasecmp(Val,"chunked") == 0) - Encoding = Chunked; - return true; - } - - if (stringcasecmp(Tag,"Connection:") == 0) - { - if (stringcasecmp(Val,"close") == 0) - Persistent = false; - if (stringcasecmp(Val,"keep-alive") == 0) - Persistent = true; - return true; - } - - if (stringcasecmp(Tag,"Last-Modified:") == 0) - { - if (StrToTime(Val,Date) == false) - return _error->Error(_("Unknown date format")); - return true; - } - - return true; -} - /*}}}*/ - -static const CFOptionFlags kNetworkEvents = - kCFStreamEventOpenCompleted | - kCFStreamEventHasBytesAvailable | - kCFStreamEventEndEncountered | - kCFStreamEventErrorOccurred | -0; - -static void CFReadStreamCallback(CFReadStreamRef stream, CFStreamEventType event, void *arg) { - switch (event) { - case kCFStreamEventOpenCompleted: - break; - - case kCFStreamEventHasBytesAvailable: - case kCFStreamEventEndEncountered: - *reinterpret_cast(arg) = 1; - CFRunLoopStop(CFRunLoopGetCurrent()); - break; - - case kCFStreamEventErrorOccurred: - *reinterpret_cast(arg) = -1; - CFRunLoopStop(CFRunLoopGetCurrent()); - break; - } -} - -/* http://lists.apple.com/archives/Macnetworkprog/2006/Apr/msg00014.html */ -int CFReadStreamOpen(CFReadStreamRef stream, double timeout) { - CFStreamClientContext context; - int value(0); - - memset(&context, 0, sizeof(context)); - context.info = &value; - - if (CFReadStreamSetClient(stream, kNetworkEvents, CFReadStreamCallback, &context)) { - CFReadStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopCommonModes); - if (CFReadStreamOpen(stream)) - CFRunLoopRunInMode(kCFRunLoopDefaultMode, timeout, false); - else - value = -1; - CFReadStreamSetClient(stream, kCFStreamEventNone, NULL, NULL); - } - - return value; -} - -// HttpMethod::SendReq - Send the HTTP request /*{{{*/ -// --------------------------------------------------------------------- -/* This places the http request in the outbound buffer */ -void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) -{ - URI Uri = Itm->Uri; - - // The HTTP server expects a hostname with a trailing :port - char Buf[1000]; - string ProperHost = Uri.Host; - if (Uri.Port != 0) - { - sprintf(Buf,":%u",Uri.Port); - ProperHost += Buf; - } - - // Just in case. - if (Itm->Uri.length() >= sizeof(Buf)) - abort(); - - /* Build the request. We include a keep-alive header only for non-proxy - requests. This is to tweak old http/1.0 servers that do support keep-alive - but not HTTP/1.1 automatic keep-alive. Doing this with a proxy server - will glitch HTTP/1.0 proxies because they do not filter it out and - pass it on, HTTP/1.1 says the connection should default to keep alive - and we expect the proxy to do this */ - if (Proxy.empty() == true || Proxy.Host.empty()) - sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", - QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str()); - else - { - /* Generate a cache control header if necessary. We place a max - cache age on index files, optionally set a no-cache directive - and a no-store directive for archives. */ - sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", - Itm->Uri.c_str(),ProperHost.c_str()); - // only generate a cache control header if we actually want to - // use a cache - if (_config->FindB("Acquire::http::No-Cache",false) == false) - { - if (Itm->IndexFile == true) - sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n", - _config->FindI("Acquire::http::Max-Age",0)); - else - { - if (_config->FindB("Acquire::http::No-Store",false) == true) - strcat(Buf,"Cache-Control: no-store\r\n"); - } - } - } - // generate a no-cache header if needed - if (_config->FindB("Acquire::http::No-Cache",false) == true) - strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n"); - - - string Req = Buf; - - // Check for a partial file - struct stat SBuf; - if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) - { - // In this case we send an if-range query with a range header - sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",(long)SBuf.st_size - 1, - TimeRFC1123(SBuf.st_mtime).c_str()); - Req += Buf; - } - else - { - if (Itm->LastModified != 0) - { - sprintf(Buf,"If-Modified-Since: %s\r\n",TimeRFC1123(Itm->LastModified).c_str()); - Req += Buf; - } - } - - if (Proxy.User.empty() == false || Proxy.Password.empty() == false) - Req += string("Proxy-Authorization: Basic ") + - Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n"; - - if (Uri.User.empty() == false || Uri.Password.empty() == false) - Req += string("Authorization: Basic ") + - Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - - Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n"; - - if (Debug == true) - cerr << Req << endl; - - Out.Read(Req); -} - /*}}}*/ -// HttpMethod::Go - Run a single loop /*{{{*/ -// --------------------------------------------------------------------- -/* This runs the select loop over the server FDs, Output file FDs and - stdin. */ -bool HttpMethod::Go(bool ToFile,ServerState *Srv) -{ - // Server has closed the connection - if (Srv->ServerFd == -1 && (Srv->In.WriteSpace() == false || - ToFile == false)) - return false; - - fd_set rfds,wfds; - FD_ZERO(&rfds); - FD_ZERO(&wfds); - - /* Add the server. We only send more requests if the connection will - be persisting */ - if (Srv->Out.WriteSpace() == true && Srv->ServerFd != -1 - && Srv->Persistent == true) - FD_SET(Srv->ServerFd,&wfds); - if (Srv->In.ReadSpace() == true && Srv->ServerFd != -1) - FD_SET(Srv->ServerFd,&rfds); - - // Add the file - int FileFD = -1; - if (File != 0) - FileFD = File->Fd(); - - if (Srv->In.WriteSpace() == true && ToFile == true && FileFD != -1) - FD_SET(FileFD,&wfds); - - // Add stdin - FD_SET(STDIN_FILENO,&rfds); - - // Figure out the max fd - int MaxFd = FileFD; - if (MaxFd < Srv->ServerFd) - MaxFd = Srv->ServerFd; - - // Select - struct timeval tv; - tv.tv_sec = TimeOut; - tv.tv_usec = 0; - int Res = 0; - if ((Res = select(MaxFd+1,&rfds,&wfds,0,&tv)) < 0) - { - if (errno == EINTR) - return true; - return _error->Errno("select",_("Select failed")); - } - - if (Res == 0) - { - _error->Error(_("Connection timed out")); - return ServerDie(Srv); - } - - // Handle server IO - if (Srv->ServerFd != -1 && FD_ISSET(Srv->ServerFd,&rfds)) - { - errno = 0; - if (Srv->In.Read(Srv->ServerFd) == false) - return ServerDie(Srv); - } - - if (Srv->ServerFd != -1 && FD_ISSET(Srv->ServerFd,&wfds)) - { - errno = 0; - if (Srv->Out.Write(Srv->ServerFd) == false) - return ServerDie(Srv); - } - - // Send data to the file - if (FileFD != -1 && FD_ISSET(FileFD,&wfds)) - { - if (Srv->In.Write(FileFD) == false) - return _error->Errno("write",_("Error writing to output file")); - } - - // Handle commands from APT - if (FD_ISSET(STDIN_FILENO,&rfds)) - { - if (Run(true) != -1) - exit(100); - } - - return true; -} - /*}}}*/ -// HttpMethod::Flush - Dump the buffer into the file /*{{{*/ -// --------------------------------------------------------------------- -/* This takes the current input buffer from the Server FD and writes it - into the file */ -bool HttpMethod::Flush(ServerState *Srv) -{ - if (File != 0) - { - // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking - // can't be set - if (File->Name() != "/dev/null") - SetNonBlock(File->Fd(),false); - if (Srv->In.WriteSpace() == false) - return true; - - while (Srv->In.WriteSpace() == true) - { - if (Srv->In.Write(File->Fd()) == false) - return _error->Errno("write",_("Error writing to file")); - if (Srv->In.IsLimit() == true) - return true; - } - - if (Srv->In.IsLimit() == true || Srv->Encoding == ServerState::Closes) - return true; - } - return false; -} - /*}}}*/ -// HttpMethod::ServerDie - The server has closed the connection. /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool HttpMethod::ServerDie(ServerState *Srv) -{ - unsigned int LErrno = errno; - - // Dump the buffer to the file - if (Srv->State == ServerState::Data) - { - // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking - // can't be set - if (File->Name() != "/dev/null") - SetNonBlock(File->Fd(),false); - while (Srv->In.WriteSpace() == true) - { - if (Srv->In.Write(File->Fd()) == false) - return _error->Errno("write",_("Error writing to the file")); - - // Done - if (Srv->In.IsLimit() == true) - return true; - } - } - - // See if this is because the server finished the data stream - if (Srv->In.IsLimit() == false && Srv->State != ServerState::Header && - Srv->Encoding != ServerState::Closes) - { - Srv->Close(); - if (LErrno == 0) - return _error->Error(_("Error reading from server. Remote end closed connection")); - errno = LErrno; - return _error->Errno("read",_("Error reading from server")); - } - else - { - Srv->In.Limit(-1); - - // Nothing left in the buffer - if (Srv->In.WriteSpace() == false) - return false; - - // We may have got multiple responses back in one packet.. - Srv->Close(); - return true; - } - - return false; -} - /*}}}*/ -// HttpMethod::DealWithHeaders - Handle the retrieved header data /*{{{*/ -// --------------------------------------------------------------------- -/* We look at the header data we got back from the server and decide what - to do. Returns - 0 - File is open, - 1 - IMS hit - 3 - Unrecoverable error - 4 - Error with error content page - 5 - Unrecoverable non-server error (close the connection) */ -int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) -{ - // Not Modified - if (Srv->Result == 304) - { - unlink(Queue->DestFile.c_str()); - Res.IMSHit = true; - Res.LastModified = Queue->LastModified; - return 1; - } - - /* We have a reply we dont handle. This should indicate a perm server - failure */ - if (Srv->Result < 200 || Srv->Result >= 300) - { - _error->Error("%u %s",Srv->Result,Srv->Code); - if (Srv->HaveContent == true) - return 4; - return 3; - } - - // This is some sort of 2xx 'data follows' reply - Res.LastModified = Srv->Date; - Res.Size = Srv->Size; - - // Open the file - delete File; - File = new FileFd(Queue->DestFile,FileFd::WriteAny); - if (_error->PendingError() == true) - return 5; - - FailFile = Queue->DestFile; - FailFile.c_str(); // Make sure we dont do a malloc in the signal handler - FailFd = File->Fd(); - FailTime = Srv->Date; - - // Set the expected size - if (Srv->StartPos >= 0) - { - Res.ResumePoint = Srv->StartPos; - ftruncate(File->Fd(),Srv->StartPos); - } - - // Set the start point - lseek(File->Fd(),0,SEEK_END); - - delete Srv->In.Hash; - Srv->In.Hash = new Hashes; - - // Fill the Hash if the file is non-empty (resume) - if (Srv->StartPos > 0) - { - lseek(File->Fd(),0,SEEK_SET); - if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false) - { - _error->Errno("read",_("Problem hashing file")); - return 5; - } - lseek(File->Fd(),0,SEEK_END); - } - - SetNonBlock(File->Fd(),true); - return 0; -} - /*}}}*/ -// HttpMethod::SigTerm - Handle a fatal signal /*{{{*/ -// --------------------------------------------------------------------- -/* This closes and timestamps the open file. This is neccessary to get - resume behavoir on user abort */ -void HttpMethod::SigTerm(int) -{ - if (FailFd == -1) - _exit(100); - close(FailFd); - - // Timestamp - struct utimbuf UBuf; - UBuf.actime = FailTime; - UBuf.modtime = FailTime; - utime(FailFile.c_str(),&UBuf); - - _exit(100); -} - /*}}}*/ -// HttpMethod::Fetch - Fetch an item /*{{{*/ -// --------------------------------------------------------------------- -/* This adds an item to the pipeline. We keep the pipeline at a fixed - depth. */ -bool HttpMethod::Fetch(FetchItem *) -{ - if (Server == 0) - return true; - - // Queue the requests - int Depth = -1; - bool Tail = false; - for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; - I = I->Next, Depth++) - { - // If pipelining is disabled, we only queue 1 request - if (Server->Pipeline == false && Depth >= 0) - break; - - // Make sure we stick with the same server - if (Server->Comp(I->Uri) == false) - break; - if (QueueBack == I) - Tail = true; - if (Tail == true) - { - QueueBack = I->Next; - SendReq(I,Server->Out); - continue; - } - } - - return true; -}; - /*}}}*/ -// HttpMethod::Configuration - Handle a configuration message /*{{{*/ -// --------------------------------------------------------------------- -/* We stash the desired pipeline depth */ -bool HttpMethod::Configuration(string Message) -{ - if (pkgAcqMethod::Configuration(Message) == false) - return false; - - TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut); - PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth", - PipelineDepth); - Debug = _config->FindB("Debug::Acquire::http",false); - - return true; -} - /*}}}*/ -// HttpMethod::Loop - Main loop /*{{{*/ -// --------------------------------------------------------------------- -/* */ -int HttpMethod::Loop() -{ - signal(SIGTERM,SigTerm); - signal(SIGINT,SigTerm); - - Server = 0; - - std::set cached; - - int FailCounter = 0; - while (1) - { - // We have no commands, wait for some to arrive - if (Queue == 0) - { - if (WaitFd(STDIN_FILENO) == false) - return 0; - } - - /* Run messages, we can accept 0 (no message) if we didn't - do a WaitFd above.. Otherwise the FD is closed. */ - int Result = Run(true); - if (Result != -1 && (Result != 0 || Queue == 0)) - return 100; - - if (Queue == 0) - continue; - - CFStringEncoding se = kCFStringEncodingUTF8; - - char *url = strdup(Queue->Uri.c_str()); - url: - URI uri = std::string(url); - std::string hs = uri.Host; - - if (cached.find(hs) != cached.end()) { - _error->Error("Cached Failure"); - Fail(true); - free(url); - FailCounter = 0; - continue; - } - - std::string urs = uri; - - for (;;) { - size_t bad = urs.find_first_of("+"); - if (bad == std::string::npos) - break; - // XXX: generalize - urs = urs.substr(0, bad) + "%2b" + urs.substr(bad + 1); - } - - CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se); - CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL); - CFRelease(sr); - CFHTTPMessageRef hm = CFHTTPMessageCreateRequest(kCFAllocatorDefault, CFSTR("GET"), ur, kCFHTTPVersion1_1); - CFRelease(ur); - - struct stat SBuf; - if (stat(Queue->DestFile.c_str(), &SBuf) >= 0 && SBuf.st_size > 0) { - sr = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("bytes=%li-"), (long) SBuf.st_size - 1); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Range"), sr); - CFRelease(sr); - - sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(SBuf.st_mtime).c_str(), se); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Range"), sr); - CFRelease(sr); - - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Cache-Control"), CFSTR("no-cache")); - } else if (Queue->LastModified != 0) { - sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(Queue->LastModified).c_str(), se); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Modified-Since"), sr); - CFRelease(sr); - - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Cache-Control"), CFSTR("no-cache")); - } else - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Cache-Control"), CFSTR("max-age=0")); - - if (Firmware_ != NULL) - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Firmware"), Firmware_); - - sr = CFStringCreateWithCString(kCFAllocatorDefault, Machine_, se); - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Machine"), sr); - CFRelease(sr); - - if (UniqueID_ != NULL) - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("X-Unique-ID"), UniqueID_); - - CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.534")); - - CFReadStreamRef rs = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, hm); - CFRelease(hm); - -#define _kCFStreamPropertyReadTimeout CFSTR("_kCFStreamPropertyReadTimeout") -#define _kCFStreamPropertyWriteTimeout CFSTR("_kCFStreamPropertyWriteTimeout") -#define _kCFStreamPropertySocketImmediateBufferTimeOut CFSTR("_kCFStreamPropertySocketImmediateBufferTimeOut") - - /*SInt32 to(TimeOut); - CFNumberRef nm(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &to));*/ - double to(TimeOut); - CFNumberRef nm(CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &to)); - - CFReadStreamSetProperty(rs, _kCFStreamPropertyReadTimeout, nm); - CFReadStreamSetProperty(rs, _kCFStreamPropertyWriteTimeout, nm); - CFReadStreamSetProperty(rs, _kCFStreamPropertySocketImmediateBufferTimeOut, nm); - CFRelease(nm); - - CFDictionaryRef dr = SCDynamicStoreCopyProxies(NULL); - CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPProxy, dr); - CFRelease(dr); - - //CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPShouldAutoredirect, kCFBooleanTrue); - CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue); - - FetchResult Res; - CFIndex rd; - UInt32 sc; - - uint8_t data[10240]; - size_t offset = 0; - - Status("Connecting to %s", hs.c_str()); - - switch (CFReadStreamOpen(rs, to)) { - case -1: - CfrsError("Open", rs); - goto fail; - - case 0: - _error->Error("Host Unreachable"); - cached.insert(hs); - goto fail; - - case 1: - /* success */ - break; - - fail: - Fail(true); - goto done; - } - - rd = CFReadStreamRead(rs, data, sizeof(data)); - - if (rd == -1) { - CfrsError(uri.Host.c_str(), rs); - cached.insert(hs); - Fail(true); - goto done; - } - - Res.Filename = Queue->DestFile; - - hm = (CFHTTPMessageRef) CFReadStreamCopyProperty(rs, kCFStreamPropertyHTTPResponseHeader); - sc = CFHTTPMessageGetResponseStatusCode(hm); - - if (sc == 301 || sc == 302) { - sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Location")); - if (sr == NULL) { - Fail(); - goto done_; - } else { - size_t ln = CFStringGetLength(sr) + 1; - free(url); - url = static_cast(malloc(ln)); - - if (!CFStringGetCString(sr, url, ln, se)) { - Fail(); - goto done_; - } - - CFRelease(sr); - goto url; - } - } - - sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Content-Range")); - if (sr != NULL) { - size_t ln = CFStringGetLength(sr) + 1; - char cr[ln]; - - if (!CFStringGetCString(sr, cr, ln, se)) { - Fail(); - goto done_; - } - - CFRelease(sr); - - if (sscanf(cr, "bytes %lu-%*u/%lu", &offset, &Res.Size) != 2) { - _error->Error(_("The HTTP server sent an invalid Content-Range header")); - Fail(); - goto done_; - } - - if (offset > Res.Size) { - _error->Error(_("This HTTP server has broken range support")); - Fail(); - goto done_; - } - } else { - sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Content-Length")); - if (sr != NULL) { - Res.Size = CFStringGetIntValue(sr); - CFRelease(sr); - } - } - - time(&Res.LastModified); - - sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Last-Modified")); - if (sr != NULL) { - size_t ln = CFStringGetLength(sr) + 1; - char cr[ln]; - - if (!CFStringGetCString(sr, cr, ln, se)) { - Fail(); - goto done_; - } - - CFRelease(sr); - - if (!StrToTime(cr, Res.LastModified)) { - _error->Error(_("Unknown date format")); - Fail(); - goto done_; - } - } - - if (sc < 200 || sc >= 300 && sc != 304) { - sr = CFHTTPMessageCopyResponseStatusLine(hm); - - size_t ln = CFStringGetLength(sr) + 1; - char cr[ln]; - - if (!CFStringGetCString(sr, cr, ln, se)) { - Fail(); - goto done; - } - - CFRelease(sr); - - _error->Error("%s", cr); - - Fail(); - goto done_; - } - - CFRelease(hm); - - if (sc == 304) { - unlink(Queue->DestFile.c_str()); - Res.IMSHit = true; - Res.LastModified = Queue->LastModified; - URIDone(Res); - } else { - Hashes hash; - - File = new FileFd(Queue->DestFile, FileFd::WriteAny); - if (_error->PendingError() == true) { - delete File; - File = NULL; - Fail(); - goto done; - } - - FailFile = Queue->DestFile; - FailFile.c_str(); // Make sure we dont do a malloc in the signal handler - FailFd = File->Fd(); - FailTime = Res.LastModified; - - Res.ResumePoint = offset; - ftruncate(File->Fd(), offset); - - if (offset != 0) { - lseek(File->Fd(), 0, SEEK_SET); - if (!hash.AddFD(File->Fd(), offset)) { - _error->Errno("read", _("Problem hashing file")); - delete File; - File = NULL; - Fail(); - goto done; - } - } - - lseek(File->Fd(), 0, SEEK_END); - - URIStart(Res); - - read: if (rd == -1) { - CfrsError("rd", rs); - Fail(true); - } else if (rd == 0) { - if (Res.Size == 0) - Res.Size = File->Size(); - - struct utimbuf UBuf; - time(&UBuf.actime); - UBuf.actime = Res.LastModified; - UBuf.modtime = Res.LastModified; - utime(Queue->DestFile.c_str(), &UBuf); - - Res.TakeHashes(hash); - URIDone(Res); - } else { - hash.Add(data, rd); - - uint8_t *dt = data; - while (rd != 0) { - int sz = write(File->Fd(), dt, rd); - - if (sz == -1) { - delete File; - File = NULL; - Fail(); - goto done; - } - - dt += sz; - rd -= sz; - } - - rd = CFReadStreamRead(rs, data, sizeof(data)); - goto read; - } - } - - goto done; - done_: - CFRelease(hm); - done: - CFReadStreamClose(rs); - CFRelease(rs); - free(url); - - FailCounter = 0; - } - - return 0; -} - /*}}}*/ - -int main() -{ - setlocale(LC_ALL, ""); - - HttpMethod Mth; - - size_t size; - sysctlbyname("hw.machine", NULL, &size, NULL, 0); - char *machine = new char[size]; - sysctlbyname("hw.machine", machine, &size, NULL, 0); - Machine_ = machine; - - const char *path = "/System/Library/CoreServices/SystemVersion.plist"; - CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (uint8_t *) path, strlen(path), false); - - CFPropertyListRef plist; { - CFReadStreamRef stream = CFReadStreamCreateWithFile(kCFAllocatorDefault, url); - CFReadStreamOpen(stream); - plist = CFPropertyListCreateFromStream(kCFAllocatorDefault, stream, 0, kCFPropertyListImmutable, NULL, NULL); - CFReadStreamClose(stream); - } - - CFRelease(url); - - if (plist != NULL) { - Firmware_ = (CFStringRef) CFRetain(CFDictionaryGetValue((CFDictionaryRef) plist, CFSTR("ProductVersion"))); - CFRelease(plist); - } - - if (void *lockdown = lockdown_connect()) { - UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey); - lockdown_disconnect(lockdown); - } - - return Mth.Loop(); -} - - diff --git a/methods/http.h b/methods/http.h index 541e295..6753a99 100644 --- a/methods/http.h +++ b/methods/http.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - HTTP Aquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP aquire method for APT. ##################################################################### */ /*}}}*/ @@ -158,6 +158,4 @@ class HttpMethod : public pkgAcqMethod }; }; -URI Proxy; - #endif diff --git a/methods/https.cc b/methods/https.cc new file mode 100644 index 0000000..98dfeef --- /dev/null +++ b/methods/https.cc @@ -0,0 +1,312 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ +/* ###################################################################### + + HTTPS Acquire Method - This is the HTTPS aquire method for APT. + + It uses libcurl + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "config.h" +#include "https.h" + + /*}}}*/ +using namespace std; + +size_t +HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) +{ + HttpsMethod *me = (HttpsMethod *)userp; + + if(me->File->Write(buffer, size*nmemb) != true) + return false; + + return size*nmemb; +} + +int +HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, + double ultotal, double ulnow) +{ + HttpsMethod *me = (HttpsMethod *)clientp; + if(dltotal > 0 && me->Res.Size == 0) { + me->Res.Size = (unsigned long)dltotal; + me->URIStart(me->Res); + } + return 0; +} + +void HttpsMethod::SetupProxy() +{ + URI ServerName = Queue->Uri; + + // Determine the proxy setting + if (getenv("http_proxy") == 0) + { + string DefProxy = _config->Find("Acquire::http::Proxy"); + string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); + if (SpecificProxy.empty() == false) + { + if (SpecificProxy == "DIRECT") + Proxy = ""; + else + Proxy = SpecificProxy; + } + else + Proxy = DefProxy; + } + + // Parse no_proxy, a , separated list of domains + if (getenv("no_proxy") != 0) + { + if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + Proxy = ""; + } + + // Determine what host and port to use based on the proxy settings + string Host; + if (Proxy.empty() == true || Proxy.Host.empty() == true) + { + } + else + { + if (Proxy.Port != 0) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} + + +// HttpsMethod::Fetch - Fetch an item /*{{{*/ +// --------------------------------------------------------------------- +/* This adds an item to the pipeline. We keep the pipeline at a fixed + depth. */ +bool HttpsMethod::Fetch(FetchItem *Itm) +{ + stringstream ss; + struct stat SBuf; + struct curl_slist *headers=NULL; + char curl_errorstr[CURL_ERROR_SIZE]; + long curl_responsecode; + URI Uri = Itm->Uri; + string remotehost = Uri.Host; + + // TODO: + // - http::Pipeline-Depth + // - error checking/reporting + // - more debug options? (CURLOPT_DEBUGFUNCTION?) + + curl_easy_reset(curl); + SetupProxy(); + + // callbacks + curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); + curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); + curl_easy_setopt(curl, CURLOPT_FILETIME, true); + + // SSL parameters are set by default to the common (non mirror-specific) value + // if available (or a default one) and gets overload by mirror-specific ones. + + // File containing the list of trusted CA. + string cainfo = _config->Find("Acquire::https::CaInfo",""); + string knob = "Acquire::https::"+remotehost+"::CaInfo"; + cainfo = _config->Find(knob.c_str(),cainfo.c_str()); + if(cainfo != "") + curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str()); + + // Check server certificate against previous CA list ... + bool peer_verify = _config->FindB("Acquire::https::Verify-Peer",true); + knob = "Acquire::https::" + remotehost + "::Verify-Peer"; + peer_verify = _config->FindB(knob.c_str(), peer_verify); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify); + + // ... and hostname against cert CN or subjectAltName + int default_verify = 2; + bool verify = _config->FindB("Acquire::https::Verify-Host",true); + knob = "Acquire::https::"+remotehost+"::Verify-Host"; + verify = _config->FindB(knob.c_str(),verify); + if (!verify) + default_verify = 0; + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify); + + // For client authentication, certificate file ... + string pem = _config->Find("Acquire::https::SslCert",""); + knob = "Acquire::https::"+remotehost+"::SslCert"; + pem = _config->Find(knob.c_str(),pem.c_str()); + if(pem != "") + curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str()); + + // ... and associated key. + string key = _config->Find("Acquire::https::SslKey",""); + knob = "Acquire::https::"+remotehost+"::SslKey"; + key = _config->Find(knob.c_str(),key.c_str()); + if(key != "") + curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str()); + + // Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not + // supported by GnuTLS). + long final_version = CURL_SSLVERSION_DEFAULT; + string sslversion = _config->Find("Acquire::https::SslForceVersion",""); + knob = "Acquire::https::"+remotehost+"::SslForceVersion"; + sslversion = _config->Find(knob.c_str(),sslversion.c_str()); + if(sslversion == "TLSv1") + final_version = CURL_SSLVERSION_TLSv1; + else if(sslversion == "SSLv3") + final_version = CURL_SSLVERSION_SSLv3; + curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); + + // cache-control + if(_config->FindB("Acquire::http::No-Cache",false) == false) + { + // cache enabled + if (_config->FindB("Acquire::http::No-Store",false) == true) + headers = curl_slist_append(headers,"Cache-Control: no-store"); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + headers = curl_slist_append(headers, ss.str().c_str()); + } else { + // cache disabled by user + headers = curl_slist_append(headers, "Cache-Control: no-cache"); + headers = curl_slist_append(headers, "Pragma: no-cache"); + } + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); + + // speed limit + int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + if (dlLimit > 0) + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); + + // set header + curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + + // set timeout + int timeout = _config->FindI("Acquire::http::Timeout",120); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); + + // debug + if(_config->FindB("Debug::Acquire::https", false)) + curl_easy_setopt(curl, CURLOPT_VERBOSE, true); + + // error handling + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); + + // if we have the file send an if-range query with a range header + if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) + { + char Buf[1000]; + sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n", + (long)SBuf.st_size - 1, + TimeRFC1123(SBuf.st_mtime).c_str()); + headers = curl_slist_append(headers, Buf); + } + else if(Itm->LastModified > 0) + { + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified); + } + + // go for it - if the file exists, append on it + File = new FileFd(Itm->DestFile, FileFd::WriteAny); + if (File->Size() > 0) + File->Seek(File->Size() - 1); + + // keep apt updated + Res.Filename = Itm->DestFile; + + // get it! + CURLcode success = curl_easy_perform(curl); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &curl_responsecode); + + long curl_servdate; + curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate); + + // cleanup + if(success != 0) + { + unlink(File->Name().c_str()); + _error->Error("%s", curl_errorstr); + Fail(); + return true; + } + File->Close(); + + // Timestamp + struct utimbuf UBuf; + if (curl_servdate != -1) { + UBuf.actime = curl_servdate; + UBuf.modtime = curl_servdate; + utime(File->Name().c_str(),&UBuf); + } + + // check the downloaded result + struct stat Buf; + if (stat(File->Name().c_str(),&Buf) == 0) + { + Res.Filename = File->Name(); + Res.LastModified = Buf.st_mtime; + Res.IMSHit = false; + if (curl_responsecode == 304) + { + unlink(File->Name().c_str()); + Res.IMSHit = true; + Res.LastModified = Itm->LastModified; + Res.Size = 0; + URIDone(Res); + return true; + } + Res.Size = Buf.st_size; + } + + // take hashes + Hashes Hash; + FileFd Fd(Res.Filename, FileFd::ReadOnly); + Hash.AddFD(Fd.Fd(), Fd.Size()); + Res.TakeHashes(Hash); + + // keep apt updated + URIDone(Res); + + // cleanup + Res.Size = 0; + delete File; + curl_slist_free_all(headers); + + return true; +}; + +int main() +{ + setlocale(LC_ALL, ""); + + HttpsMethod Mth; + curl_global_init(CURL_GLOBAL_SSL) ; + + return Mth.Run(); +} + + diff --git a/methods/https.h b/methods/https.h new file mode 100644 index 0000000..2c33d95 --- /dev/null +++ b/methods/https.h @@ -0,0 +1,48 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +/* ###################################################################### + + HTTP Acquire Method - This is the HTTP aquire method for APT. + + ##################################################################### */ + /*}}}*/ + +#ifndef APT_HTTP_H +#define APT_HTTP_H + +#define MAXLEN 360 + +#include +#include + +using std::cout; +using std::endl; + +class HttpsMethod; + + +class HttpsMethod : public pkgAcqMethod +{ + + virtual bool Fetch(FetchItem *); + static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); + static int progress_callback(void *clientp, double dltotal, double dlnow, + double ultotal, double ulnow); + void SetupProxy(); + CURL *curl; + FetchResult Res; + + public: + FileFd *File; + + HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) + { + File = 0; + curl = curl_easy_init(); + }; +}; + +URI Proxy; + +#endif diff --git a/methods/makefile b/methods/makefile index 4ca3cf8..0b52da1 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,75 +7,82 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.11 +LIB_APT_PKG_MAJOR = 4.6 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method PROGRAM=file -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = file.cc include $(PROGRAM_H) # The copy method PROGRAM=copy -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = copy.cc include $(PROGRAM_H) # The gzip method PROGRAM=gzip -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = gzip.cc include $(PROGRAM_H) # The gpgv method PROGRAM=gpgv -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = gpgv.cc include $(PROGRAM_H) # The cdrom method PROGRAM=cdrom -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = cdrom.cc include $(PROGRAM_H) # The http method PROGRAM=http -SLIBS = -lapt-pkg $(SOCKETLIBS) -framework CoreFoundation -framework CFNetwork -framework SystemConfiguration -framework IOKit -llockdown +SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -framework CoreFoundation -framework CFNetwork -framework SystemConfiguration -framework IOKit -llockdown LIB_MAKES = apt-pkg/makefile SOURCE = http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) +# The https method +PROGRAM=https +SLIBS = -lapt-pkg -lcurl $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = https.cc +include $(PROGRAM_H) + # The ftp method PROGRAM=ftp -SLIBS = -lapt-pkg $(SOCKETLIBS) +SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = ftp.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) # The rred method PROGRAM=rred -SLIBS = -lapt-pkg $(SOCKETLIBS) +SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = rred.cc include $(PROGRAM_H) # The rsh method PROGRAM=rsh -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = rsh.cc include $(PROGRAM_H) -# SSH and vzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 +# SSH and bzip2 method symlink +binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma +veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma $(BIN)/ssh: echo "Installing ssh method link" ln -fs rsh $(BIN)/ssh @@ -85,5 +92,10 @@ clean-$(BIN)/ssh: $(BIN)/bzip2: echo "Installing bzip2 method link" ln -fs gzip $(BIN)/bzip2 +$(BIN)/lzma: + echo "Installing lzma method link" + ln -fs gzip $(BIN)/lzma clean-$(BIN)/bzip2: -rm $(BIN)/bzip2 +clean-$(BIN)/lzma: + -rm $(BIN)/lzma diff --git a/methods/rred.cc b/methods/rred.cc index 8171a92..6fa57f3 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - #include #include #include @@ -257,15 +253,6 @@ bool RredMethod::Fetch(FetchItem *Itm) int main(int argc, char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - RredMethod Mth; Prog = strrchr(argv[0],'/'); diff --git a/methods/rsh.cc b/methods/rsh.cc index 25fbae5..f0ccfc4 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -1,7 +1,3 @@ -extern "C" { - #include -} - // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: rsh.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $ @@ -515,15 +511,6 @@ bool RSHMethod::Fetch(FetchItem *Itm) int main(int argc, const char *argv[]) { -#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "_useMDNSResponder"; - nlist("/usr/lib/libc.dylib", nl); - if (nl[0].n_type != N_UNDF) - *(int *) nl[0].n_value = 0; -#endif - setlocale(LC_ALL, ""); RSHMethod Mth; diff --git a/po/ChangeLog b/po/ChangeLog index 1171d28..3e9057d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,601 @@ +2008-12-11 Christian Perrier + + * fr.po: fix spelling error to "défectueux" + +2009-01-04 Tetralet + + * zh_TW.po: Added as 538t1u. + +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. + +2008-12-12 Tapio Lehtonen + + * fi.po: updated to 539t. + +2008-12-06 Christian Perrier + + * fr.po: dropped awful use of first person + +2008-11-23 Artem Bondarenko + + * uk.po: updated to 477t55f7u + +2008-11-23 Sampada Nakhare + + * mr.po: updated to 539t + +2008-11-21 Yuri Kozlov + + * ru.po: Update to 539t + +2008-11-18 Piarres Beobide + + * eu.po: updated to 539t. + +2008-11-17 Felipe Augusto van de Wiel (faw) + + * pt_BR.po: updated to 539t. + +2008-11-17 Hans Fredrik Nordhaug + + * nb.po: updated to 539t. + +2008-11-17 Miroslav Kure + + * cs.po: updated to 539t. + +2008-11-17 Miguel Figueiredo + + * pt.po: Updated to 539t + +2008-11-16 Javier Fernandez-Sanguino + + * es.po: updated to 539t + +2008-11-15 Deng Xiyue + + * zh_CN.po: updated to 539t. + +2008-11-15 Eddy Petrișor + + * ro.po: updated to 539t. + +2008-11-15 Javier Fernandez-Sanguino + + * es.po: updated to 536t3f2u + +2008-11-14 Holger Wansing + + * de.po: Updated to 539t + +2008-11-14 Wiktor Wandachowicz + + * pl.po: Updated to 539t + +2008-11-14 Neil Williams + + * en_GB.po: Updated to 539t + +2008-11-14 Samuele Giovanni Tonon + + * it.po: Updated to 539t + +2008-11-14 Jordi Mallach + + * ca.po: Updated to 539t + +2008-11-14 Changwoo Ryu + + * ko.po: Updated to 539t + +2008-11-14 Kenshi Muto + + * ja.po: Updated to 539t + +2008-11-14 Daniel Nylander + + * sv.po: Updated to 539t + +2008-11-14 Ivan Masár + + * sk.po: Updated to 539t + +2008-11-13 Damyan Ivanov + + * bg.po: Updated to 538t1f + +2008-11-13 Christian Perrier + + * Update all PO files and apt-all.pot. 538 strings. + Formerly complete PO files are now 538t1f + * French translation re-completed + +2008-11-09 Theppitak Karoonboonyanan + + * th.po: updated to 540t. + +2008-11-06 Christian Perrier + + * Update all PO files and apt-all.pot. 540 strings. + Formerly complete PO files are now 538t1f1u + +2008-09-19 Jordi Mallach + + * ca.po: Update to 538t + +2008-09-16 Wiktor Wandachowicz + + * pl.po: Update to 538t + +2008-09-16 Yuri Kozlov + + * ru.po: Update to 538t + +2008-09-12 Emmanuel Galatoulas + + * el.po: Update to 538t + +2008-09-10 Miguel Figueiredo + + * pt.po: Updated to 538t + +2008-09-05 Clytie Siddall + + * vi.po: updated to 538t. + +2008-09-01 Hans Fredrik Nordhaug + + * nb.po: updated to 538t. + +2008-08-31 Miroslav Kure + + * cs.po: updated to 538t. + +2008-08-28 Piarres Beobide + + * eu.po: updated to 538t. + +2008-08-26 Felipe Augusto van de Wiel (faw) + + * pt_BR.po: updated to 538t. + +2008-08-18 Deng Xiyue + + * zh_CN.po: updated to 538t. + +2008-08-07 Serafeim Zanikolas + + * el.po: updated to 534t3f1u. + +2008-08-02 Gintautas Miliauskas + + * lt.po: updated to 300t4f234u. + +2008-08-01 Kenshi Muto + + * ja.po: updated to 538t. + +2008-07-28 Eddy Petrisor + + * ro.po: updated to 538t. + +2008-07-28 Jacobo Tarrio + + * gl.po: updated to 538t. + +2008-07-27 Ivan Masár + + * sk.po: Updated to 538t + +2008-07-26 Damyan Ivanov + + * bg.po: Updated to 538t + +2008-07-26 Christian Perrier + + * fr.po: Updated to 538t + +2008-07-25 Michael Vogt + + * Update all PO files and apt-all.pot. 538 strings. + Formerly complete PO files are now 536t1f1u + +2008-07-21 Miguel Figueiredo + + * pt.po: Updated to 536t + +2008-07-19 Changwoo Ryu + + * ko.po: Updated to 536t + +2008-07-12 Holger Wansing + + * de.po: corrected. + +2008-06-29 Asho Yeh + + * zh_TW.po: Updated to 536t + +2008-06-27 Eddy Petrisor + + * ro.po: updated to 536t. + +2008-05-14 Hans Fr. Nordhaug + + * nb.po: updated to 536t. + +2008-05-11 SZERVÁC Attila + + * hu.po: updated to 536t. + +2008-05-11 Felipe Augusto van de Wiel (faw) + + * pt_BR.po: updated to 536t. + +2008-05-08 Erdal Ronahi + + * ku.po: updated to 136t25f343u + +2008-05-08 Bart Cornelis + + * nl.po: updated to 536t. + +2008-05-07 Jens Seidel + + * de.po: updated to 536t. + +2008-05-07 Peter Karlsson + + * sv.po: updated to 536t. + +2008-05-07 Miguel Figueiredo + + * pt.po: updated to 536t. + +2008-05-07 Jacobo Tarrio + + * gl.po: updated to 536t. + +2008-05-07 Yuri Kozlov + + * ru.po: updated to 536t. + +2008-05-07 Clytie Siddall + + * vi.po: updated to 536t. + +2008-05-06 Peter Mann + + * sk.po: updated to 536t. + +2008-05-06 Miroslav Kure + + * cs.po: updated to 536t. + +2008-05-06 Kenshi Muto + + * ja.po: updated to 536t. + +2008-05-05 Piarres Beobide + + * eu.po: updated to 536t. + +2008-05-05 Sunjae Park + + * ko.po: updated to 536t. + +2008-05-05 Tapio Lehtonen + + * fi.po: updated to 536t. + +2008-05-04 Damyan Ivanov + + * bg.po: updated to 536t. + +2008-05-04 Samuele Giovanni Tonon + + * it.po: updated to 536t. + +2008-05-04 Wiktor Wandachowicz + + * pl.po: updated to 536t. + +2008-05-04 Theppitak Karoonboonyanan + + * th.po: updated to 536t. + +2008-05-04 Christian Perrier + + * fr.po: updated to 536t. + +2008-05-04 Christian Perrier + + * Update all PO files and apt-all.pot. 536 strings. + Formerly complete PO files are now 535t1u (new string + from dselect/install. See #322470 + +2008-05-04 Deng Xiyue + + * zh_CN.po: updated to 535t. Closes: #473360 + +2008-05-03 Clytie Siddall + + * vi.po: updated to 535t. Closes: #479008 + +2008-04-19 Jacobo Tarrío + + * gl.po: updated to 536t. + +2008-04-16 Damyan Ivanov + + * bg.po: updated to 536t. + +2008-04-16 Christian Perrier + + * fr.po: updated to 536t. + +2008-03-19 Ivan Masár + + * sk.po: updated to 536t. + +2008-03-06 Wiktor Wandachowicz \ + + * pl.po: updated to 536t. + +2008-02-28 Peter Karlsson + + * sv.po: updated to 536t. + +2008-02-21 Jens Seidel + + * de.po: updated to 536t. Closes: #466842 + +2008-02-16 Deng Xiyue + + * zh_CN.po: updated to 536t. Closes: #465866 + +2008-02-13 Sunjae Park + + * ko.po: updated to 529t7f. Closes: #448430 + +2008-02-07 Miguel Figueiredo + + * pt.po: updated to 536t. Closes: #464575 + +2008-01-19 Christian Perrier + + * Preventive unfuzzy files for a message aimed at fixing #452640 + +2008-01-19 Jacobo Tarrio + + * gl.po: updated to 536t. Closes: #461468 + +2008-01-17 Piarres Beobide + + * eu.po: updated to 536t. Closes: #461166 + +2008-01-13 Christian Perrier + + * Update all PO files and apt-all.pot. 536 strings. + Formerly complete PO files are now 534t2f but were + unfuzzied + +2008-01-04 Clytie Siddall + + * vi.po: updated to 536t. Closes: #459013 + +2008-01-02 Hans Fredrik Nordhaug + + * nb.po: Updated to 536t. Closes: #457917 + +2007-12-29 Deng Xiyue + + * zh_CN.po: Updated to 536t. Closes: #458039 + +2007-12-18 Kenshi Muto + + * ja.po: Updated to 536t. Closes: #456909 + +2007-12-17 Christian Perrier + + * fr.po: completed to 536t. + +2007-12-17 Christian Perrier + + * Update all PO files and apt-all.pot. 536 strings. + Formerly complete PO files are now 530t6f + +2007-12-15 Christian Perrier + + * fr.po: completed to 542t. + +2007-12-15 Christian Perrier + + * Update all PO files and apt-all.pot. 542 strings. + Formerly complete PO files are now 536t6f + +2007-12-01 Clytie Siddall + + * vi.po: updated to 536t. + +2007-11-27 Piarres Beobide + + * eu.po: updated to 536t. + +2007-11-01 Christian Perrier + + * *.po: preventive unfuzzy after removal of an extra space + in a message "Stored label: %s\n" + +2007-10-30 Peter Karlsson + + * sv.po: updated to 536t. + +2007-10-29 Jacobo Tarrio + + * gl.po: updated to 536t. Closes: #448497 + +2007-10-29 Sunjae Park + + * ko.po: Updated to 536t. Closes: #448430 + +2007-10-28 Christian Perrier + + * Add a bunch of languages that were not listed in LINGUAS: + Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai + +2007-10-28 Christian Perrier + + * fr.po: completed to 536t. + +2007-10-28 Christian Perrier + + * Update all PO files and apt-all.pot. 536 strings. + Formerly complete PO files are now 532t3f1u + +2007-10-14 Jacobo Tarrio + + * gl.po: updated to 535t. Closes: #446626 + +2007-10-12 Peter Karlsson + + * sv.po: updated to 535t. + +2007-09-17 Theppitak Karoonboonyanan + + * th.po: added with 535t. Closes: #442833 + +2007-09-07 Claus Hindsgaul + + * da.po: completed to 532t3f. Closes: #441102 + +2007-09-03 Clytie Siddall + + * vi.po: completed to 535t. Closes: #440611 + +2007-08-07 Piarres Beobide + + * eu.po: completed to 535t. Closes: #436425 + +2007-08-04 Christian Perrier + + * fr.po: completed to 535t. + +2007-08-04 Christian Perrier + + * Update all PO and the POT. Gives 529t6f for formerly + complete translations + +2007-07-11 Piarres Beobide + + * eu.po: completed to 532t. Closes: #423766 + +2007-07-06 Christian Perrier + + * Update all PO and the POT. Gives 529t3f for formerly + complete translations + * Unfuzzy formerly complete translations (es, fr, gl, vi) + +2007-06-21 Javier Fernandez-Sanguino + + * es.po: completed to 532t, again. Closes: #429935 + +2007-06-21 Clytie Siddall + + * vi.po: completed to 532t, again. Closes: #429899 + +2007-06-19 Jacobo Tarrío + + * gl.po: completed to 532t. Closes: #429506 + +2007-06-13 Clytie Siddall + + * vi.po: completed to 532t. Closes: #428672 + +2007-06-12 Christian Perrier + + * Update all PO and the POT. Gives 514t14f4u for formerly + complete translations + * fr.po: completed to 532t + +2007-06-12 Christian Perrier + + * ku.po, uk.po, LINGUAS: reintegrate those translations + which disappeared from the BZR repositories + +2007-06-01 Clytie Siddall + + * vi.po: Updated to 515t. Closes: #426976 + +2007-05-13 Piarres Beobide + + * eu.po: Updated to 515t. Closes: #423766 + +2007-05-10 Miguel Figueiredo + + * pt.po: 515t. Closes: #423111 + +2007-05-08 Christian Perrier + + * fr.po: Updated by Christian Perrier + +2007-05-08 Christian Perrier + + * Update all PO and the POT. Gives 513t2f for formerly + complete translations + +2007-04-01 priti Patil + + * mr.po: New Marathi translation + Closes: #416806 + +2007-03-31 Kov Chai + + * zh_CN.po: Updated by Kov Chai + Closes: #416822 + +2007-03-29 eric pareja + + * tl.po: Updated by Eric Pareja + Closes: #416638 + +2007-02-28 Jacobo Tarrio + + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + +2007-02-03 Claus Hindsgaul + + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + +2007-01-29 Christian Perrier + + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + +2006-12-12 Yuri Kozlov + + * ru.po: Updated Russian translation. Closes: #405476 + +2006-12-12 Christian Perrier + + * *.po: Unfuzzy after upstream typo corrections + +2006-12-12 Eugeniy Meshcheryakov + + * uk.po: Updated Ukrainian translation: 495t16f3u + 2006-11-04 Artem Bondarenko * uk.po: New Ukrainian translation: 483t28f3u diff --git a/po/LINGUAS b/po/LINGUAS index eaf179b..1b7bdef 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -bg bs ca cs cy da de el en_GB es eu fi fr gl he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW +ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW diff --git a/po/apt-all.pot b/po/apt-all.pot index 7f66ee8..7e7499b 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: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -243,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:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "" @@ -252,31 +260,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -318,445 +326,445 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr "" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: 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 "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -764,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -839,79 +847,121 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: 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 "" + +#. +#. 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 "" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -919,163 +969,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: 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 "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1090,6 +1129,8 @@ msgid "" " 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" @@ -1105,7 +1146,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1173,24 +1214,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1199,188 +1244,188 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1388,77 +1433,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "" @@ -1477,26 +1522,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1556,7 +1600,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1568,7 +1612,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1622,7 +1666,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1649,59 +1693,59 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@ -1711,33 +1755,33 @@ msgstr "" msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1753,427 +1797,452 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 #, c-format -msgid "Selection %s not found" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format -msgid "Unrecognized type abbreviation: '%c'" +msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Opening configuration file %s" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Line %d too long (max %d)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2181,217 +2250,240 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: 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 "" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "" @@ -2400,146 +2492,178 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" +msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" diff --git a/po/ar.po b/po/ar.po index 8a0b747..01d779c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -18,145 +18,155 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "أسماء الحزم الكلية :" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " الحزم العادية:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "الحزمة الوهمية تماماً:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " الحزمة الوهمية المفردة:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " الحزم الوهمية المختلطة:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " مفقودة:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "مجموع النسخ الفريدة:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "مجموع النسخ الفريدة:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "مجموع المعتمدات:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "مجموع علاقات النسخ/الملفات:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "مجموع علاقات النسخ/الملفات:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "مجموع علاقات النسخ/الملفات:" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "مجموع المساحة المحسوب حسابها:" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "يجب أن تعطي صيغة واحدة بالضبط" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "لم يُعثر على أية حزم" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "ملفات الحزم:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "الحزم المُدبّسة:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(غير موجود)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " مُثبّت:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(لاشيء)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " مرشّح: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -179,8 +189,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -246,7 +256,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -255,31 +265,31 @@ msgstr "تعذرت الكتابة إلى %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "قائمة توسيعات الحزمة طويلة جداً" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "خطأ في معالجة الدليل %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "قائمة توسيعات المصدر طويلة جداً" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "خطأ في معالجة المحتويات %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -321,303 +331,303 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "لم تُطابق أية تحديدات" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: تعذرت قراءة الدليل %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "فشل فتح %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** فشل ربط %s بـ%s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "تعذر فتح %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " أو" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -625,143 +635,143 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "تصحيح المعتمدات..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " فشل." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "لم يمكن تصحيح المعتمدات" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "لم يمكن تقليص مجموعة الترقية" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " تم" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "تعذرت قراءة قائمة المصادر." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -772,28 +782,28 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "إجهاض." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -801,47 +811,47 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "الحزمة %s وهميّة وتوفّرها:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [مُثبّتة]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -849,80 +859,124 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "الحزمة %s ليس لها مرشح تثبيت" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "تعذر قفل دليل القائمة" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "سيتم تثبيت الحزم الجديدة التالية:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "قد تساعد المعلومات التالية في حل المشكلة:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "تعذر العثور على الحزمة %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "إلا أنه سيتم تثبيت %s" + +#: 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:1549 +#: 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' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -930,163 +984,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "قد تساعد المعلومات التالية في حل المشكلة:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: 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 "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1101,6 +1144,8 @@ msgid "" " 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" @@ -1116,7 +1161,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1187,24 +1232,28 @@ msgstr "" msgid "Bad default setting!" msgstr "إعداد افتراضيّ سيّء!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "اضغط مفتاح الإدخال للاستمرار." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" @@ -1213,188 +1262,188 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها msgid "Merging available information" msgstr "دمج المعلومات المتوفرة" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "فشل تنفيذ gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "أرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "توقيع الأرشيف غير صالح" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "الأرشيف قصير جداً" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "فشلت قراءة ترويسات الأرشيف" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "خطأ داخلي في AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "المسار %s طويل جداً" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "فكّ تحزيم %s أكثر من مرّة" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "المسار طويل جداً" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "تعذرت إزالة %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "تعذر إنشاء %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "قراءة قوائم الحزم" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "فشل تغيير دليل الإدارة إلى %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "خطأ داخلي أثناء الحصول على اسم الحزمة" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "قراءة سرد الملفات" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1402,77 +1451,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "خطأ داخلي أثناء الحصول على node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "تعذر التغيير إلى %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "خطأ داخلي، تعذر العثور على العضو" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "فشل العثور على ملف تحكّم صالح" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "" @@ -1493,25 +1542,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "القرص المدمج الخطأ" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: 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 "فشيل تنفيذ stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -1573,7 +1622,7 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "خطأ في القراءة" @@ -1585,7 +1634,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1639,7 +1688,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1666,59 +1715,59 @@ msgstr "استعلام" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "تعذر الاتصال بـ%s %s:" @@ -1728,33 +1777,33 @@ msgstr "تعذر الاتصال بـ%s %s:" msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1770,427 +1819,454 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "بانتظار الترويسات" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "سطر ترويسة سيء" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "أرسل خادم http ترويسة ردّ غير صالحة" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "خادم http له دعم مدى معطوب" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "فشلت كتابة الملف %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" msgstr "خطأ داخلي" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "اختصار نوع مجهول: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "فتح ملف التهيئة %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "السطر %d طويل جداً (أقصاه %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... خطأ!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... تمّ" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "خيار سطر الأمر '%c' [من %s] مجهول." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 غير مفهوم" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "الخيار %s يتطلّب مُعطى." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "الخيار '%s' طويل جداً" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "يعتمد" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "يعتمد مسبقاً" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "يستحسن" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "يقترح" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "يعارض" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "يستبدل" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "يُلغي" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "مهم" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "مطلوب" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "قياسي" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "اختياري" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "إضافي" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "دمج المعلومات المتوفرة" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "فشل فتح %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "فشلت كتابة الملف %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2198,216 +2274,241 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: 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 "" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: 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' وضغط مفتاح الإدخال." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "نظام الحزم '%s' غير مدعوم" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5Sum غير متطابقة" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: 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 "" -#: apt-pkg/acquire-item.cc:812 +#: 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 "" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2416,54 +2517,66 @@ msgstr "الحجم غير متطابق" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "جاري التعرف..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "فك تركيب القرص المدمج..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "فك تركيب القرص المدمج\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "بانتظار القرص...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "تركيب القرص...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2472,95 +2585,140 @@ msgstr "" "هذا القرص مسمى: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "كتابة لائحة المصادر الجديدة\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "فك تركيب القرص المدمج..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "تم تثبيت %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "تهيئة %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "إزالة %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "تهيئة %s" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "خطأ في معالجة الدليل %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "إزالة %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" +#, 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 "openpty failed\n" +#~ msgstr "فشل التحديد" + #~ msgid "File date has changed %s" #~ msgstr "تغير تاريخ الملف %s" diff --git a/po/bg.po b/po/bg.po index 3da419e..a7c6038 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,161 +1,175 @@ +# translation of apt_po_bg.po to Bulgarian # Bulgarian translation of apt. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. -# Yavor Doganov , 2006. # +# Yavor Doganov , 2006. +# Damyan Ivanov , 2008. +# Damyan Ivanov , 2008. +# Damyan Ivanov , 2008. msgid "" msgstr "" -"Project-Id-Version: apt 0.6\n" +"Project-Id-Version: apt_po_bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-12 20:14+0300\n" -"Last-Translator: Yavor Doganov \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-12 21:57+0200\n" +"Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \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" +"X-Generator: KBabel 1.11.4\n" -#: cmdline/apt-cache.cc:135 +#: 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 не може да бъде намерен" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Общо имена на пакети : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Нормални пакети: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Чисти виртуални пакети: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Единични виртуални пакети: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Смесени виртуални пакети: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Липсващи: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Общо уникални версии: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Общо уникални описания: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Общо зависимости: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Общо отношения версия/файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Общо отношения описание/файл: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Общо отношения „Осигурява“: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Общо разгърнати низове: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Общо пространство за зависимости по версии: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Общо празно пространство: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Трябва да въведете само един израз" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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“ на пакетен файл" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(не са намерени)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(няма)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s за %s %s, компилиран на %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s за %s компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -178,8 +192,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -306,7 +320,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -315,31 +329,31 @@ msgstr "Неуспех при записа на %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Списъкът с разширения на пакети и твърде дълъг" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Грешка при обработката на директория %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Списъкът с разширения на източници е твърде дълъг" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Грешка при запазването на заглавната част във файла със съдържание" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Грешка при обработката на съдържание %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -424,26 +438,26 @@ msgstr "" " -c=? Четене на този конфигурационен файл.\n" " -o=? Настройване на произволна конфигурационна опция" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Няма съвпадения на избора" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е повредена, файлът е преименуван на %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -451,278 +465,278 @@ msgstr "" "Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, " "премахнете базата от данни и я създайте наново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Неуспех при четенето на директория %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неуспех при четенето на %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Грешките се отнасят за файла " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Неуспех при превръщането на %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Неуспех при обхода на дървото" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Неуспех при прочитането на връзка %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Неуспех при премахването на връзка %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Неуспех при създаването на връзка %s към %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Неправилно форматиран override %s, ред %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Неправилно форматиран override %s, ред %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Неправилно форматиран override %s, ред %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Неуспех при четенето на override файл %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Непознат алгоритъм за компресия „%s“" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Компресираният изход %s изисква настройка за компресирането" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Неуспех при създаването на FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Неуспех при пускането на подпроцес" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Процес-потомък за компресиране" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "декомпресираща програма" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -730,146 +744,148 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Коригиране на зависимостите..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " пропадна." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Неуспех при коригирането на зависимостите" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Неуспех при минимизирането на набора актуализации" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Инсталиране на тези пакети без проверка [y/N]?" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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“" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Списъкът с източници не можа да бъде прочетен." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"След тази операция ще бъде използвано %sB допълнително дисково " +"пространство.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +896,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,47 +925,47 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Забележете, избиране на %s вместо %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Инсталиран]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Трябва изрично да изберете един за инсталиране." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,75 +976,119 @@ msgstr "" "Това може да означава, че пакета липсва, остарял е, или е достъпен\n" "само от друг източник\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Обаче следните пакети го заместват:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Пакетът %s няма кандидат за инсталиране" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " -"са използвани по-стари." +"Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 скапа нещо, а това не би трябвало\n" +"да се слоучва. Съобщете за грешка в пакета 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 "" +"Следната информация може да помогне за намиране на изход от ситуацията:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Неуспех при намирането на задача %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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“, за да коригирате:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1096,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1048,133 +1108,118 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1569 -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" -"доклад за грешка за този пакет." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Следната информация може да помогне за намиране на изход от ситуацията:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1183,7 +1228,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1238,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1233,6 +1278,8 @@ msgid "" " 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" @@ -1248,7 +1295,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1268,35 +1315,37 @@ msgstr "" "и „install“.\n" "\n" "Команди:\n" -" update - Зареждане на нови списъци с пакети\n" -" upgrade - Извършване на актуализиране\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" +" build-dep - Конфигуриране на зависимостите за компилиране на пакети от\n" +" изходен код dist-upgrade - Актуализиране на дистрибуцията, " +"вж. apt-get(8)\n" " dselect-upgrade - Следване на избора на dselect\n" " clean - Изтриване на изтеглените файлове\n" " autoclean - Изтриване на стари изтеглени файлове\n" -" check - Проверка за счупени зависимости\n" +" check - Проверка за неудовлетворени зависимости\n" "\n" "Опции:\n" " -h Този помощен текст.\n" " -q Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n" -" -qq Без изход на съобщения освен при грешки\n" +" -qq Без извеждане на съобщения, освен при грешки\n" " -d Само изтегляне - да НЕ се инсталират или разпакетират архивите\n" " -s Без действие. Предизвикване на симулация.\n" " -y Отговаряне с „Да“ на всички въпроси, без питане\n" -" -f Опит за продължаване дори и при неуспех на проверката за цялост\n" +" -f Опит за поправяне на неудовлетворени зависимости\n" " -m Опит за продължаване дори и ако архивите са неоткриваеми\n" -" -u Показване на списък с пакетите са актуализиране\n" +" -u Показване и на списък с пакетите за актуализиране\n" " -b Компилиране на изходния код на пакета след изтеглянето му\n" -" -V Показване на подробни версии\n" +" -V Показване на подробна информация за версиите\n" " -c=? Четене на този конфигурационен файл\n" -" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" -"tmp\n" -"Вижте страниците на apt-get(8), sources.list(5) и apt.conf(5) за повече\n" +" -o=? Настройване на произволна конфигурационна опция,\n" +" напр. -o dir::cache=/tmp\n" +"Вижте руководството на apt-get(8), sources.list(5) и apt.conf(5) за повече\n" "информация и опции.\n" " Това APT има Върховни Сили.\n" @@ -1370,24 +1419,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Лоша стандартна настройка!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: 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“, за да продължите." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Желаете ли да изтриете изтеглените пакетни файлове?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1397,189 +1450,189 @@ msgstr "" msgid "Merging available information" msgstr "Смесване на наличната информация" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Невалиден подпис на архива" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Грешка при четене на заглавната част на елемента на архива" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Невалидна заглавна част на елемента на архива" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Архивът е твърде кратък" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Неуспех при четенето на заглавните части на архива" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Извикан е DropNode за все още използван възел" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Грешка при намирането на хеш-елемента!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Неуспех при установяване на отклонението" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Вътрешна грешка в AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойно добавяне на отклонение %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Пътят %s е твърде дълъг" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Разпакетиране на %s повече от веднъж" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Директорията %s е отклонена" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Пътят за отклонение е твърде дълъг" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорията %s се заменя с не-директория" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Неуспех при намирането на възел в неговия хеш" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Пътят е твърде дълъг" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файловете се заменят със съдържанието на пакета %s без версия" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s заменя този в пакет %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Неуспех при получаването на атрибути за %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Неуспех при премахването на %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Неуспех при създаването на %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Неуспех при получаването на атрибути %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Директориите info и temp трябва да бъдат на една и съща файлова система" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Четене на списъците с пакети" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Неуспех при преминаването в администраторската директория %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Вътрешна грешка при получаването на името на пакета" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Четене на списъка на файловете" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1590,77 +1643,77 @@ msgstr "" "възстановите този файл, запишете го като празен и веднага преинсталирайте " "същата версия на пакета!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Вътрешна грешка при получаването на възел" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Неуспех при отварянето на файл с отклонения %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Файлът с отклонения е повреден" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Вътрешна грешка при добавянето на отклонение" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Първо трябва да се инициализира кеша с пакети" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Грешка при анализирането на MD5. Изместване %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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“" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Това не е валиден DEB архив, няма елемент „%s“, „%s“ или „%s“" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Неуспех при преминаването в %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Вътрешна грешка, не може да се открие елемент" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Неуспех при намирането на валиден контролен файл" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Контролен файл, невъзможен за анализ" @@ -1681,26 +1734,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Грешен CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Неуспех при получаването на атрибути" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1762,7 +1814,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1774,7 +1826,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -1830,7 +1882,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1857,59 +1909,59 @@ msgstr "Запитване" msgid "Unable to invoke " msgstr "Неуспех при извикването на " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Свързване с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Не може да се започне свързване с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временен неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Неуспех при свързването с %s %s:" @@ -1919,39 +1971,39 @@ msgstr "Неуспех при свързването с %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Неуспех при достъпа до набор на ключове: „%s“" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " "на работа." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е " -"gnupg?)" +"gpgv?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1969,436 +2021,461 @@ msgstr "Неуспех при отварянето на програмен ка msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Неуспех при отрязване на края на файла" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Вътрешна грешка" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Невъзможно е да се прехвърли в паметта празен файл" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Изборът %s не е намерен" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Ред %d е твърде дълъг (максимум %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: Директиви могат да се задават само в най-горното " "ниво" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: Извикан „include“ оттук" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Грешка!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестна опция за команден ред „%c“ [от %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 не е разпозната" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Опцията за команден ред %s не е булева" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s изисква аргумент." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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: Значението трябва да има =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s изисква аргумент цяло число, не „%s“" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Опция „%s“ е твърде дълга" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смисълът %s не е ясен, опитайте true или false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Невалидна операция %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Празен кеш на пакети" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Файлът за кеш на пакети е повреден" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Файлът за кеш на пакети е несъвместима версия" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Тази версия на APT не поддържа система за версии „%s“" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Предварително зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлага се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Препоръчва се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтира с" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменя" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Изважда от употреба" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Чупи" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важен" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "изискван" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "незадължителен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "допълнителен" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Изграждане на дървото със зависимости" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Версии кандидати" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Генериране на зависимости" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Четене на информацията за състоянието" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Неуспех при отварянето на StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Неуспех при запис на временен StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" "Лошо форматиран ред %u в списъка с източници %s (идентификатор на " "производител)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2410,12 +2487,12 @@ msgstr "" "пакет %s. Това често е лошо, но ако наистина искате да го направите, " "активирайте опцията APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не се поддържа индексен файл от типа „%s“" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2423,7 +2500,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2431,189 +2508,214 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " +"са използвани по-стари." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Директорията за архиви %spartial липсва." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Изтегляне на файл %li от %li (остават %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Изтегляне на файл %li от %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Неуспех при намирането на драйвер за метод %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:377 +#: 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“." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Пакетната система „%s“ не е поддържана" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех при определянето на подходяща пакетна система" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Неуспех при получаването на атрибути на %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " "или отворени." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Кешът има несъвместима система за версии" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Възникна грешка при обработката на %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Възникна грешка при обработката на %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Възникна грешка при обработката на %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Възникна грешка при обработката на %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Възникна грешка при обработката на %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Възникна грешка при обработката на %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Възникна грешка при обработката на %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Възникна грешка при обработката на %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "" "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя описания, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Възникна грешка при обработката на %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Възникна грешка при обработката на %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Несъответствие на контролната сума" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2622,7 +2724,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2631,14 +2733,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2647,7 +2749,7 @@ msgstr "Несъответствие на размера" msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2656,49 +2758,60 @@ msgstr "" "Използване на точка за монтиране на CD-ROM %s\n" "Монтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Идентифициране..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Демонтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " -"подписа.\n" +"Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu " +"индекса с преводи и %zu подписа.\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Намерен е етикет „%s“\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2707,97 +2820,131 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Демонтиране на CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Инсталиране на %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Конфигуриране на %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Премахване на %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Изпълнение на тригер след инсталиране %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Директорията „%s“ липсва" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Конфигуриране на %s" +msgid "Processing triggers for %s" +msgstr "Обработка на тригерите на %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Премахване на %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %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" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Неуспех при отварянето на файла %s" +msgstr "Неуспех при закърпване на файла" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" + +#~ msgid "Dynamic MMap ran out of room" +#~ 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" +#~ "доклад за грешка за този пакет." diff --git a/po/bs.po b/po/bs.po index 7eafebc..545bcc3 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -14,145 +14,155 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Ukupno naziva paketa:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normalni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čisto virtuelni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pojedinačni virutuelni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " MijeÅ¡ani virtuelni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Nedostajući:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Ukupno različitih verzija:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Ukupno različitih verzija:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Ukupno zavisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Ukupno Verzija/Datoteka odnosa:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -175,8 +185,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -254,7 +264,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -264,31 +274,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -330,447 +340,447 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je bila oÅ¡tećena, datoteka preimenovana u %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokuÅ¡avam nadogradnju %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ali nije instaliran" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ili" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: 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 "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. PokuÅ¡ajte koristeći -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -778,75 +788,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -854,79 +864,122 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Slijedeći NOVI paketi će biti instalirani:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "ali se %s treba instalirati" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -934,163 +987,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "NeuspjeÅ¡no" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: 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 "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1105,6 +1147,8 @@ msgid "" " 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" @@ -1120,7 +1164,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1188,24 +1232,28 @@ msgstr "" msgid "Bad default setting!" msgstr "LoÅ¡a podrazumjevana postavka!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pritisnite enter za nastavak." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1214,188 +1262,188 @@ msgstr "" msgid "Merging available information" msgstr "Sastavljam dostupne informacije" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Ne mogu izvrÅ¡iti gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "OÅ¡tećena arhiva" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oÅ¡tećena" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiva je prekratka" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Putanja je preduga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Ne mogu čitati %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ne mogu kreirati %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Čitam spiskove paketa" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Čitam spisak datoteke" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1403,77 +1451,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "" @@ -1493,27 +1541,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "PogreÅ¡an CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se joÅ¡ uvijek koristi." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1573,7 +1620,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "GreÅ¡ka pri čitanju" @@ -1586,7 +1633,7 @@ msgstr "" msgid "Protocol corruption" msgstr "OÅ¡tećenje protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "GreÅ¡ka pri pisanju" @@ -1640,7 +1687,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1667,59 +1714,59 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ne mogu se povezati sa %s %s:" @@ -1729,34 +1776,34 @@ msgstr "Ne mogu se povezati sa %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1772,428 +1819,455 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Ne mogu ukloniti %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Povezivanje neuspjeÅ¡no" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 #, c-format -msgid "Selection %s not found" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format -msgid "Unrecognized type abbreviation: '%c'" +msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Opening configuration file %s" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Line %d too long (max %d)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Unaprijed zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Predlaže" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Preporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamjenjuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarijeva" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "važno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "zahtijevano" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionalno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Sastavljam dostupne informacije" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Ne mogu otvoriti %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Ne mogu ukloniti %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2201,217 +2275,240 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: 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 "" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Čitam spisak datoteke" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "" @@ -2420,148 +2517,181 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "PogreÅ¡an CD" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Instalirano:" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Povezujem se sa %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Otvaram %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Povezujem se sa %s" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, c-format +msgid "Processing triggers for %s" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Otvaram %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" @@ -2570,5 +2700,9 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Povezivanje neuspjeÅ¡no" + #~ msgid "File date has changed %s" #~ msgstr "Datum datoteke je promijenjen %s" diff --git a/po/ca.po b/po/ca.po index 065d8db..d15338f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,161 +1,169 @@ # Catalan translation of APT. -# Copyright © 2002, 2003, 2004, 2005, 2006 Software in the Public Interest, Inc. +# Copyright © 2002, 2003, 2004, 2005, 2006, 2008 Software in the Public Interest, Inc. # Antoni Bella Perez , 2002, 2003. # Matt Bonner , 2003. -# Jordi Mallach , 2004, 2005, 2006. +# Jordi Mallach , 2004, 2005, 2006, 2008. # msgid "" msgstr "" -"Project-Id-Version: apt 0.6\n" +"Project-Id-Version: apt 0.7.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-02-05 22:00+0100\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquet %s versió %s té una dependència sense satisfer:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquets normals: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquets virtuals purs: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquets virtuals únics: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquets virtuals mixtes: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Falten: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total de versions diferents: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Total de descripcions diferents: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total de dependències: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total de relacions versió/fitxer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Total de relacions descripció/fitxer: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total dels mapes aportats: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total de cadenes globals: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total de l'espai per a dependències de versió: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total de l'espai desperdiciat: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total de l'espai atribuit a: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Heu de donar exactament un patró" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(no trobat)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instal·lat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(cap)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s per a %s %s compilat el %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s per a %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -178,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -193,7 +201,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 "" -"Ús: apt-cache [opcions] ordre\n" +"Forma d'ús: apt-cache [opcions] ordre\n" " apt-cache [opcions] add fitxer1 [fitxer2 ...]\n" " apt-cache [opcions] showpkg paquet1 [paquet2 ...]\n" " apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n" @@ -214,17 +222,17 @@ msgstr "" " show - Mostra un registre llegible pel paquet\n" " depends - Mostra informació de dependències (en cru) d'un paquet\n" " rdepends - Mostra informació de dependències enrere d'un paquet\n" -" pkgnames - Llista els noms de tots els paquets\n" -" dotty - Genera gràfiques del paquet per a GraphVis\n" +" pkgnames - Llista els noms de tots els paquets del sistema\n" +" dotty - Genera gràfiques del paquet per a GraphViz\n" " xvcg - Genera gràfiques del paquet per a xvcg\n" -" policy - Mostra configuració de política\n" +" policy - Mostra la configuració de política\n" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" " -p=? La memòria cau de paquets.\n" " -s=? La memòria cau de la font.\n" " -q Inhabilita l'indicatiu de progres.\n" -" -i Sols mostra dependències importants d'una ordre inadequada.\n" +" -i Només mostra dependències importants d'una ordre inadequada.\n" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n" "Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " @@ -261,7 +269,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ús: apt-config [opcions] ordre\n" +"Forma d'ús: apt-config [opcions] ordre\n" "\n" "apt-config és una simple eina per a llegir el fitxer de configuració d'APT\n" "\n" @@ -292,7 +300,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ús: apt-extracttemplates fitxer1 [fitxer2 ...]\n" +"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 ...]\n" "\n" "apt-extracttemplates és una eina per a extreure informació de\n" "configuració i plantilles dels paquets debian\n" @@ -303,7 +311,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -312,31 +320,31 @@ msgstr "No es pot escriure en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "S'ha produït un error en processar el directori %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,452 +425,454 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:76 +#: 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 format de la base de dades és invàlid. Si heu actualitzat des d'una " -"versió més antiga de l'apt, eliminieu i torneu a crear la base de dades." +"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "L'arbre està fallant" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error intern, no s'ha pogut localitzar al membre %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No es pot obrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Línia predominant %s línia malformada %lu núm 1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Línia predominant %s línia malformada %lu núm 2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Línia predominant %s línia malformada %lu núm 3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorisme de compressió desconegut '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "L'eixida comprimida %s necessita un joc de compressió" +msgstr "La sortida comprimida %s necessita un joc de compressió" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "No s'ha pogut crear FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "No s'ha pogut bifurcar" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Comprimeix el fil" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: 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" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "però està instal·lat %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "però s'instal·larà %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "però no és instal·lable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "però no està instal·lat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "però no serà instal·lat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "S'instal·laran els següents paquets NOUS:" +msgstr "S'instal·laran els paquets NOUS següents:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "S'ELIMINARAN els següents paquets:" +msgstr "Es SUPRIMIRAN els paquets següents:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "S'han mantingut els següents paquets:" +msgstr "S'han mantingut els paquets següents:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "S'actualitzaran els següents paquets:" +msgstr "S'actualitzaran els paquets següents:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "Es DESACTUALITZARAN els següents paquets:" +msgstr "Es DESACTUALITZARAN els paquets següents:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Es canviaran els següents paquets mantinguts:" +msgstr "Es canviaran els paquets retinguts següents:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"AVÍS: Els següents paquets essencials seran eliminats.\n" +"AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instal·lar, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstal·lats, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu a eliminar i %lu no actualitzats.\n" +msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu no instal·lats o eliminats completament.\n" +msgstr "%lu no instal·lats o suprimits completament.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 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:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Dependències sense satisfer. Proveu-ho usant -f." +msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" +msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." +msgstr "" +"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" +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:846 cmdline/apt-get.cc:1989 +#: 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" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,77 +883,77 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Alguns fitxers no s'han pogut descarregar" +msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: 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" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"No es poden descarregar alguns arxius, potser executant apt-get update o " +"No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" +msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" +msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,76 +964,120 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" -"No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" +msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1326 +#: 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:1384 +#: 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:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " -"s'han usat els antics." +"Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1403 +#: 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:1442 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Sembla que el supressor automàtic ha destruït alguna cosa que no deuria. Si " +"us plau, envieu un informe d'error per a l'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 informació següent pot ajudar-vos a resoldre la situació:" + +#: 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:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: 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: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:1516 +#: 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:1546 +#: 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: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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1031,7 +1085,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1039,138 +1093,124 @@ msgid "" "or been moved out of Incoming." msgstr "" "No s'han pogut instal·lar alguns paquets. Això pot ser degut a que vàreu\n" -"requerir una situació imposible o a que esteu usant la distribució\n" +"requerir una situació imposible o a que esteu emprant la distribució\n" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1569 -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 "" -"Degut a que sols heu requerit una única operació, serà molt\n" -"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" -"un informe d'error en contra d'aquest per a arxivar-lo." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "La següent informació pot ajudar-vos a resoldre la situació:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1603 +#: 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:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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:1894 +#: 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 descarregar" +msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "S'està ometent el fitxer ja descarregat «%s»\n" +msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:1992 +#: 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:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" +msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Es necessita descarregar %sB d'arxius font.\n" +msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Font descarregada %s\n" +msgstr "Obté el font %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "No s'ha pogut descarregar alguns arxius." +msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2065 +#: 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:2077 +#: 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:2078 +#: 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:2095 +#: 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:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2130 +#: 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:2158 +#: 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:2178 +#: 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:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,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:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1228,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, 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:2356 +#: cmdline/apt-get.cc:2544 #, 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:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1228,6 +1268,8 @@ msgid "" " 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" @@ -1243,7 +1285,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1259,40 +1301,42 @@ msgstr "" " apt-get [opcions] source paq1 [paq2 ...]\n" "\n" "apt-get és una simple interfície de línia d'ordres per a\n" -"descarregar i instal·lar paquets. Les ordres més freqüents\n" +"baixar i instal·lar paquets. Les ordres més freqüents\n" "són update i install.\n" "\n" "Ordres:\n" -" update - Descarrega llistes noves dels paquets\n" +" update - Obté llistes noves dels paquets\n" " upgrade - Realitza una actualització\n" -" install - Instal·la nous paquets (el paquet serà libc6 no libc6.deb)\n" -" remove - Elimina paquets\n" -" source - Descarrega arxius font\n" +" 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" +" source - Baixa arxius font\n" " build-dep - Configura dependències de construcció pels paquets font\n" -" dist-upgrade - Actualitza la distribució, mireu apt-get(8)\n" -" dselect-upgrade - Segueix les seleccions de dselect\n" -" clean - Esborra els fitxers arxiu descarregats\n" -" autoclean - Esborra els fitxers arxiu descarregats antics\n" -" check - Verifica que no hi hagi dependències sense satisfer\n" +" dist-upgrade - Actualitza la distribució, vegeu apt-get(8)\n" +" dselect-upgrade - Segueix les seleccions del dselect\n" +" clean - Esborra els fitxers d'arxiu baixats\n" +" autoclean - Esborra els fitxers d'arxiu antics baixats\n" +" check - Verifica que no hi hagi dependències trencades\n" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" -" -q Eixida a la bitàcola - sense indicatiu de progrés\n" -" -qq Sense eixida, excepte els errors\n" -" -d Sols descarrega - NO instal·la o desempaqueta arxius\n" -" -s No actua. Realitza les ordres en mode de simulació\n" -" -y Assumeix que Sí per a totes les preguntes, fa que no es pregunti\n" -" -f Intenta seguir si la comprovació d'integritat falla\n" -" -m Intenta seguir si no es localitzen els arxius\n" -" -u Mostra una llista dels paquets actualitzats també\n" -" -b Construeix des del paquet font després de descarregar-lo\n" -" -V Mostra els números de versió detallada\n" +" -q Sortida enregistrable - sense indicador de progrés\n" +" -qq Sense sortida, llevat dels errors\n" +" -d Només baixa - NO instal·les o desempaquetes arxius\n" +" -s No actues. Realitza les ordres en mode de simulació\n" +" -y Assumeix que Sí per a totes les preguntes, sense interrupcions\n" +" -f Intenta corregir un sistema amb dependències trencades\n" +" -m Intenta continuar si no es treben els arxius\n" +" -u Mostra també una llista dels paquets actualitzats\n" +" -b Construeix el paquet font després de baixar-lo\n" +" -V Mostra els números de versió detallats\n" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària, p.ex.\n" " -o dir::cache=/tmp\n" -"Consulteu el manual apt-get(8), sources.list(5) i apt.conf(5)\n" -"per a més informació i opcions\n" -" Aquest APT té tots els Poders de Super Vaca.\n" +"Vegeu els manuals apt-get(8), sources.list(5) i apt.conf(5)\n" +"per a obtenir més informació i opcions.\n" +" Aquest APT té superpoders bovins\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1313,7 +1357,7 @@ msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB descarregats en %s (%sB/s)\n" +msgstr "%sB baixats en %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1327,7 +1371,7 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"El medi ha canviat: inseriu el disc amb l'etiqueta\n" +"Canvi de medi: inseriu el disc amb l'etiqueta\n" " «%s»\n" "en la unitat «%s» i premeu Intro\n" @@ -1348,14 +1392,14 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 ...]\n" +"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 ...]\n" "\n" "apt-sortpkgs és una simple eina per a ordenar fitxers de paquets.\n" "L'opció -s s'usa per a indicar quin tipus de fitxer és.\n" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" -" -s Usar l'ordenació de fitxers font\n" +" -s Emprar l'ordenació de fitxers font\n" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n" @@ -1363,221 +1407,225 @@ msgstr "" msgid "Bad default setting!" msgstr "Paràmetre establert incorrecte!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Premeu Intro per a continuar." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Alguns errors al desempaquetar. Puc configurar" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Voleu suprimir els paquets .deb baixats previament?" #: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "S'han produït alguns errors en desempaquetar. Es configuraran" + +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" -"els paquets que estan instal·lats. Això pot resultar en errors duplicacats" +"els paquets que s'han instal·lat. Això pot resultar en errors duplicacats" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"o errors causats per dependències sense satisfer. Aquest està bé, sols els " +"o errors causats per dependències sense satisfer. Això està bé, només els " "errors" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"són importants abans d'aquest missatge. Si us plau, arregleu-los i torneu a " -"executar [I]nstall una altra vegada" +"anteriors a aquest missatge són importants. Arregleu-los i torneu a executar " +"[I]nstal·la una altra vegada" #: dselect/update:30 msgid "Merging available information" msgstr "S'està fusionant la informació disponible" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Signatura de l'arxiu no vàlida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Error llegint la capçalera del membre de l'arxiu" +msgstr "S'ha produït un rrror en llegir la capçalera del membre de l'arxiu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Capçalera del membre de l'arxiu no vàlida" +msgstr "La capçalera del membre de l'arxiu no és vàlida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'arxiu és massa petit" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Ha fallat la lectura de les capçaleres de l'arxiu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode crida a un node que encara està enllaçat" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "No s'ha trobat l'element diseminat!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No s'ha pogut assignar la desviació" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "S'ha produït un error intern en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Afegit doble d'una desviació %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "La ruta %s és massa llarga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "S'està desempaquetant %s més d'una vegada" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "El directori %s està desviat" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "La ruta de desviació és massa llarga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directori %s està sent reemplaçat per un no-directori" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "No s'ha trobat el node dins de la taula" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "La ruta és massa llarga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "No es pot llegir %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "No es pot eliminar %s" +msgstr "No es pot suprimir %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "No es pot crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "No s'ha pogut fer «stat» de %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "La info i els directoris temp necessiten estar en el mateix sistema de " "fitxers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "S'està llegint la llista de paquets" -#: apt-inst/deb/dpkgdb.cc:180 +#: 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" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "S'ha produït un error intern en obtenir un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "S'està llegint el llistat de fitxers" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1588,77 +1636,77 @@ msgstr "" "aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " "versió del paquet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "S'ha produït un error en obtenir un node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "El fitxer de desviació està corrupte" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Línia no vàlida en el fitxer de desviació: %s" +msgstr "Línia no vàlida al fitxer de desviació: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "S'ha produït un error intern en afegir una desviació" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" +msgstr "Secció ConfFile dolenta al fitxer d'estat. Desplaçament %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Aquest no és un arxiu DEB vàlid, falten els membres «%s» o «%s»" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Aquest no és un arxiu DEB vàlid, li manca el membre «%s», «%s» o «%s»" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "No s'ha pogut canviar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "S'ha produït un error intern, no s'ha trobat el membre" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "No s'ha trobat un fitxer de control vàlid" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" @@ -1673,32 +1721,31 @@ msgid "" "cannot be used to add new CD-ROMs" msgstr "" "Si us plau, useu apt-cdrom per a que aquest CD sigui reconegut per APT. No " -"pot usar-se apt-get update per afegir-ne de nous" +"pot emprar-se apt-get update per afegir-ne de nous" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD erroni" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "L'estat ha fallat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1760,7 +1807,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1772,7 +1819,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corrumput" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1827,7 +1874,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:957 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" @@ -1854,59 +1901,59 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No es pot invocar" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "S'està connectant amb %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No es pot iniciar la connexió amb %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" @@ -1916,44 +1963,44 @@ msgstr "No es pot connectar amb %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" -#: methods/gpgv.cc:100 +#: 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:204 +#: 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:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +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 " -"gnupg?)" +"gpgv?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "Les següents signatures són invàlides:\n" +msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Les següents signatures no s'han pogut verificar perquè la clau pública no " +"Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" #: methods/gzip.cc:64 @@ -1964,643 +2011,700 @@ msgstr "No s'ha pogut obrir un conducte per a %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "Error llegint des del procés %s" +msgstr "S'ha produït un error en llegir des del procés %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" -msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" +msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:548 methods/http.cc:555 +#: 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" +msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:584 +#: 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" +msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:599 +#: 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" +msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Aquest servidor http té el suport d'abast trencat" +msgstr "Aquest servidor HTTP té el suport d'abast trencat" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Error escrivint en el fitxer d'eixida" +msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Error escrivint en el fitxer" +msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Error escrivint en el fitxer" +msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "Error llegint, el servidor remot ha tancat la connexió" +msgstr "" +"S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "Error llegint des del servidor" +msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:1106 +#: 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:1105 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Error intern" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "No es pot transferir un fitxer buit a memòria" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" +"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. " +"Valor actual: %lu. (man 5 apt.conf)" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Abreujament de tipus no reconegut: '%c'" +msgstr "Abreujament de tipus no reconegut: «%c»" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Línia %d massa llarga (màx %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'" +msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fet" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "L'opció de la línia d'ordres '%c' [de %s] és desconeguda." +msgstr "L'opció de la línia d'ordres «%c» [de %s] és desconeguda." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "No s'entén l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "No és lògica l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "L'opció de la línia d'ordres %s precisa un paràmetre." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'opció %s precisa un paràmetre numèric, no '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "L'opció '%s' és massa llarga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "El sentit %s no s'entén, proveu 'true' (vertader) o 'false' (fals)." +msgstr "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operació no vàlida %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "No es pot canviar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "No s'usen blocats per a llegir el fitxer de blocat de sols lectura %s" +msgstr "" +"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: 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" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs" +msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Sub-procés %s ha eixit inesperadament" +msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Memòria cau de paquets és buida" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El fitxer de memòria cau de paquets està corromput" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El fitxer de memòria cau de paquets és una versió incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Aquest APT no suporta el sistema de versions '%s'" +msgstr "Aquest APT no suporta el sistema de versions «%s»" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predepén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggereix" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomana" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicte" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaça" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fa obsolet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Trenca" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estàndard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Dependències que genera" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "S'està llegint la informació de l'estat" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "No s'ha pogut obrir el fitxer d'estat %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"Aquesta instal·lació requereix eliminar temporalment el paquet essencial %s " +"Aquesta instal·lació requereix suprimir temporalment el paquet essencial %s " "per qüestió d'un bucle de Conflictes/Pre-dependències. Això sol ser una cosa " "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "El tipus de fitxer índex '%s', no està suportat" +msgstr "El tipus de fitxer índex «%s» no està suportat" -#: apt-pkg/algorithms.cc:241 +#: 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 paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " -"causat per paquets mantinguts." +"causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -"No es poden corregir els problemes, teniu paquets mantinguts que estan " +"No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"No es poden baixar alguns fitxers índex, s'han ignorat o en el seu lloc " +"s'han emprat els antics." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "S'està obtenint el fitxer %li de %li (falten %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "No s'ha pogut trobar el mètode de control %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:377 +#: 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." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "El sistema d'empaquetament '%s' no està suportat" +msgstr "El sistema d'empaquetament «%s» no està suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "No es pot veure l'estat de %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Heu de posar algunes URI 'font' en el vostre sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera" +msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La memòria cau té un sistema de versions incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "S'ha produït un error durant el processament de %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "S'ha produït un error durant el processament de %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç." +msgstr "" +"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " +"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, heu excedit el nombre de descripcions que aquest APT és capaç de " +"gestionar. " -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Uau, heu excedit el nombre de dependències de les que aquest APT és capaç." +"Uau, heu excedit el nombre de dependències que aquest APT és capaç de " +"gestionar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "Suma MD5 diferent" +msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "La suma resum no concorda" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2610,7 +2714,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2619,7 +2723,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2627,7 +2731,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2636,7 +2740,7 @@ msgstr "La mida no concorda" msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2645,47 +2749,60 @@ msgstr "" "S'està utilitzant el punt de muntatge de CD-ROM %s\n" "S'està muntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "S'està identificant..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "S'esta desmuntant el CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " +"traduccions i %zu signatures\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "S'ha trobat l'etiqueta «%s»\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2694,103 +2811,152 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "S'esta desmuntant el CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "S'està instal·lant %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "S'està configurant el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +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" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Manca el directori «%s»" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "S'està configurant el paquet %s" +msgid "Processing triggers for %s" +msgstr "S'estan processant els gallets per al paquet %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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'està preparant per a l'eliminació del paquet %s" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "S'està eliminant el paquet %s" +msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "S'ha eliminat el paquet %s" +msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "S'està preparant per a eliminar completament el paquet %s" +msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "S'ha eliminat completament el paquet %s" +msgstr "S'ha suprimit completament el paquet %s" + +#: 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" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "No s'ha pogut obrir el fitxer %s" +msgstr "No s'ha pogut aplicar el pedaç al fitxer" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "L'MMap dinàmic s'ha quedat sense espai" + +#~ 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" +#~ "that package should be filed." +#~ msgstr "" +#~ "Degut a que només heu requerit una única operació, serà molt\n" +#~ "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" +#~ "un informe d'error en contra d'aquest per a arxivar-lo." + #~ msgid "File date has changed %s" #~ msgstr "La data del fitxer ha canviat %s" @@ -2801,10 +2967,10 @@ msgstr "La connexió s'ha tancat prematurament" #~ msgstr "No s'ha pogut executar " #~ msgid "Preparing for remove with config %s" -#~ msgstr "S'està preparant per a eliminar amb la configuració %s" +#~ msgstr "S'està preparant per a suprimir amb la configuració %s" #~ msgid "Removed with config %s" -#~ msgstr "S'ha eliminat amb la configuració %s" +#~ msgstr "S'ha suprimit amb la configuració %s" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --git a/po/cs.po b/po/cs.po index 2c899dd..89e81c1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,159 +1,167 @@ # Czech translation of APT # This file is put in the public domain. -# Miroslav Kure , 2004-2006. +# Miroslav Kure , 2004-2008. # # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-04 18:53+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-16 18:05+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verze %s má nesplněné závislosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Nemohu najít balík %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Celkem názvů balíků: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normálních balíků: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čistě virtuálních balíků: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálních balíků: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Smíšených virtuálních balíků: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Chybějících: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Celkem různých verzí: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Celkem různých popisů: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Celkem závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Celkem vztahů ver/soubor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Celkem vztahů popis/soubor: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Celkem poskytnutých mapování: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Celkem globovaných řetězců: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celkem místa závislých verzí: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celkem jalového místa: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je Å¡patně synchronizovaný." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Musíte zadat právě jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nenalezeno)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(žádná)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s pro %s %s zkompilován na %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s pro %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -212,8 +220,8 @@ msgstr "" " show - Zobrazí informace o balíku\n" " depends - Zobrazí závislosti balíku\n" " rdepends - Zobrazí reverzní závislosti balíku\n" -" pkgnames - Vypíše jména vÅ¡ech balíků\n" -" dotty - Vygeneruje grafy ve formátu pro GraphVis\n" +" pkgnames - Vypíše jména vÅ¡ech balíků v systému\n" +" dotty - Vygeneruje grafy ve formátu pro GraphViz\n" " xvcg - Vygeneruje grafy ve formátu pro xvcg\n" " policy - Zobrazí nastavenou politiku\n" "\n" @@ -229,7 +237,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'" +msgstr "Zadejte prosím název tohoto média, např. „Debian 2.1r1 Disk 1“" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -299,7 +307,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@ -308,31 +316,31 @@ msgstr "Nemohu zapsat do %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nemohu určit verzi programu debconf. Je debconf nainstalován?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliÅ¡ dlouhý" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Chyba zpracování adresáře %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliÅ¡ dlouhý" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -393,7 +401,7 @@ msgstr "" "Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n" "Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n" "\n" -"Příkazy 'packages' a 'sources' by se měly spouÅ¡tět z kořene stromu.\n" +"Příkazy „packages“ a „sources“ by se měly spouÅ¡tět z kořene stromu.\n" "BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n" "override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n" "přítomen, je přidán do polí Filename.\n" @@ -412,26 +420,26 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je poruÅ¡ená, soubor přejmenován na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -439,278 +447,278 @@ msgstr "" "Formát databáze je neplatný. Pokud jste přeÅ¡li ze starší verze apt, databázi " "prosím odstraňte a poté ji znovu vytvořte." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nemohu otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nemohu číst adresář %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nemohu vyhodnotit %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Chyby se týkají souboru " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjiÅ¡Å¥ování %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Průchod stromem selhal" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Nemohu přečíst link %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Nemohu odlinkovat %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnitřní chyba, nemohu najít část %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nemohu otevřít %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Zkomolený soubor %s, řádek %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Zkomolený soubor %s, řádek %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Zkomolený soubor %s, řádek %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nezdařilo se přečíst override soubor %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Neznámý kompresní algoritmus '%s'" +msgstr "Neznámý kompresní algoritmus „%s“" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Selhalo vytvoření FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Volání fork() se nezdařilo" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Komprimovat potomka" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Nemohu vytvořit podproces IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " nebo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -718,144 +726,144 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalováno, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Pro opravení můžete spustit `apt-get -f install'." +msgstr "Pro opravení můžete spustit „apt-get -f install“." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s poruÅ¡enými balíky!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Nelze přečíst seznam zdrojů." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Po rozbalení bude na disku použito dalších %sB.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po této operaci bude na disku použito dalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Po rozbalení bude na disku uvolněno %sB.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Udáno 'pouze triviální', ovÅ¡em toto není triviální operace." +msgstr "Udáno „pouze triviální“, ovÅ¡em toto není triviální operace." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -863,31 +871,31 @@ msgid "" " ?] " msgstr "" "Chystáte se vykonat něco potenciálně Å¡kodlivého.\n" -"Pro pokračování opiÅ¡te frázi '%s'\n" +"Pro pokračování opiÅ¡te frázi „%s“\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "PřeruÅ¡eno." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +903,47 @@ msgstr "" "Nemohu stáhnout některé archivy. Možná spusÅ¥te apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "PřeruÅ¡uji instalaci." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,83 +954,126 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Vydání '%s' pro '%s' nebylo nalezeno" +msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Verze '%s' pro '%s' nebyla nalezena" +msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " -"použity starší verze." +"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Pro jejich odstranění použijte „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 "" +"Hmm, zdá se, že AutoRemover zničil něco, co neměl.\n" +"Nahlaste prosím chybu v 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 "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Vnitřní chyba, AutoRemover pokazil věci" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nemohu najít úlohu %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" +msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s nastaven jako instalovaný ručně.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" +msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " +"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řeÅ¡ení)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1033,138 +1084,124 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky jeÅ¡tě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1569 -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 "" -"Protože jste požádali pouze o jednoduchou operaci, je téměř jisté, že\n" -"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" -"(bug report)." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Následující informace vám mohou pomoci vyřeÅ¡it tuto situaci:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řeÅ¡itel problémů pokazil věci" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Přeskakuji dříve stažený soubor '%s'\n" +msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Příkaz pro rozbalení '%s' selhal.\n" +msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" +msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Příkaz pro sestavení '%s' selhal.\n" +msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,31 +1210,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliÅ¡ nový" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1212,6 +1249,8 @@ msgid "" " 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" @@ -1227,7 +1266,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1250,6 +1289,8 @@ msgstr "" " upgrade - Provede aktualizaci\n" " install - Instaluje nové balíky (balík je libc6, ne libc6.deb)\n" " remove - Odstraní balíky\n" +" autoremove - Automaticky odstraní nepoužívané balíky\n" +" purge - Odstraní balíky vč. konfiguračních souborů\n" " source - Stáhne zdrojové archivy\n" " build-dep - Pro zdrojové balíky nastaví build-dependencies\n" " dist-upgrade - Aktualizace distribuce, viz apt-get(8)\n" @@ -1259,17 +1300,17 @@ msgstr "" " check - Ověří, zda se nevyskytují poÅ¡kozené závislosti\n" "\n" "Volby:\n" -" -h Tato nápověda\n" -" -q Nezobrazí indikátor postupu - pro záznam\n" -" -qq Nezobrazí nic než chyby\n" -" -d Pouze stáhne - neinstaluje ani nerozbaluje archivy\n" -" -s Pouze simuluje prováděné akce\n" -" -y Na vÅ¡echny otázky odpovídá Ano\n" -" -f Zkusí pokračovat, i když selže kontrola integrity\n" -" -m Zkusí pokračovat, i když se nepodaří najít archivy\n" -" -u Zobrazí také seznam aktualizovaných balíků\n" -" -b Po stažení zdrojového balíku jej i zkompiluje\n" -" -V Zobrazí čísla verzí\n" +" -h Tato nápověda\n" +" -q Nezobrazí indikátor postupu - pro záznam\n" +" -qq Nezobrazí nic než chyby\n" +" -d Pouze stáhne - neinstaluje ani nerozbaluje archivy\n" +" -s Pouze simuluje prováděné akce\n" +" -y Na vÅ¡echny otázky odpovídá Ano\n" +" -f Zkusí opravit systém s poruÅ¡enými závislostmi\n" +" -m Zkusí pokračovat, i když se nepodaří najít archivy\n" +" -u Zobrazí také seznam aktualizovaných balíků\n" +" -b Po stažení zdrojového balíku jej i zkompiluje\n" +" -V Zobrazí čísla verzí\n" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" "Více voleb naleznete v manuálových stránkách apt-get(8), sources.list(5)\n" @@ -1310,8 +1351,8 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" "Výměna média: Vložte disk nazvaný\n" -" '%s'\n" -"do mechaniky '%s' a stiskněte enter\n" +" „%s“\n" +"do mechaniky „%s“ a stiskněte enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1345,24 +1386,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Chybné standardní nastavení!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pro pokračování stiskněte enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Chcete smazat vÅ¡echny dříve stažené .deb soubory?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Během rozbalování se vyskytly chyby. Zkusím teď nakonfigurovat" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "balíky, které se nainstalovaly. To může způsobit chybové hlášky" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "o nesplněných závislostech. To je v pořádku, důležité jsou pouze" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusÅ¥te [I]nstalovat" @@ -1371,269 +1416,269 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusÅ¥te [I]nstalova msgid "Merging available information" msgstr "Slučuji dostupné informace" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Selhalo spuÅ¡tění gzipu " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "PoruÅ¡ený archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poÅ¡kozený" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Neplatný podpis archivu" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Chyba při čtení záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Neplatné záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archiv je příliÅ¡ krátký" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Chyba při čtení hlaviček archivu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Nemohu lokalizovat hashovací prvek!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nemohu alokovat diverzi" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnitřní chyba při AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojí přidání diverze %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je příliÅ¡ dlouhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Rozbaluji %s vícekrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Adresář %s je odkloněn" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Diverzní cesta je příliÅ¡ dlouhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresář %s bude nahrazen neadresářem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nemohu nalézt uzel v jeho hashovacím kbelíku" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Cesta je příliÅ¡ dlouhá" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Přepsat vyhovující balík bez udání verze pro %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Nemohu číst %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nemohu vyhodnotit %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Selhalo odstranění %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Nemohu vytvořit %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Selhalo vyhodnocení %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Čtu seznamy balíků" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nepodařilo se změnit na admin adresář %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Vnitřní chyba při získávání jména balíku" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Čtu výpis souborů" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Selhalo otevření souboru seznamů '%sinfo/%s'. Pokud nemůžete tento soubor " +"Selhalo otevření souboru seznamů „%sinfo/%s“. Pokud nemůžete tento soubor " "obnovit, vytvořte jej nový prázdný a ihned znovu nainstalujte tu samou verzi " "balíku!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Chyba při čtení souboru se seznamy %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Vnitřní chyba při získávání uzlu" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Selhalo otevření souboru s diverzemi %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Diverzní soubor je poruÅ¡en" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Neplatná řádka v diverzním souboru: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Vnitřní chyba při přidávání diverze" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Chyba při hledání Balíku: Hlavička, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Å patná sekce ConfFile ve stavovém souboru na pozici %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Chyba při zpracování MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Toto není platný DEB archiv, chybí část '%s'" +msgstr "Toto není platný DEB archiv, chybí část „%s“" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Toto není platný DEB archiv, neobsahuje část '%s' ani '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Toto není platný DEB archiv, neobsahuje část „%s“, „%s“ ani „%s“" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Nemohu přejít do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Vnitřní chyba, nemohu nalézt člen" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Nelze najít platný kontrolní soubor" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Nezpracovatelný kontrolní soubor" @@ -1654,26 +1699,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Chybné CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Selhalo vyhodnocení" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1720,7 +1764,7 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Příkaz '%s' přihlaÅ¡ovacího skriptu selhal, server řekl: %s" +msgstr "Příkaz „%s“ přihlaÅ¡ovacího skriptu selhal, server řekl: %s" #: methods/ftp.cc:291 #, c-format @@ -1735,7 +1779,7 @@ msgstr "Čas spojení vyprÅ¡el" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1747,7 +1791,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "PoruÅ¡ení protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -1801,14 +1845,14 @@ msgstr "Spojení datového socketu vyprÅ¡elo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Nemohu stáhnout soubor, server řekl '%s'" +msgstr "Nemohu stáhnout soubor, server řekl „%s“" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1817,7 +1861,7 @@ msgstr "Datový socket vyprÅ¡el" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Přenos dat selhal, server řekl '%s'" +msgstr "Přenos dat selhal, server řekl „%s“" #. Get the files information #: methods/ftp.cc:997 @@ -1828,59 +1872,59 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nemohu vyvolat " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Připojuji se k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nemohu navázat spojení na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vyprÅ¡el" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Nemohu zjistit '%s'" +msgstr "Nemohu zjistit „%s“" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Dočasné selhání při zjiÅ¡Å¥ování '%s'" +msgstr "Dočasné selhání při zjiÅ¡Å¥ování „%s“" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Něco hodně oÅ¡klivého se přihodilo při zjiÅ¡Å¥ování '%s:%s' (%i)" +msgstr "Něco hodně oÅ¡klivého se přihodilo při zjiÅ¡Å¥ování „%s:%s“ (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" @@ -1888,36 +1932,36 @@ msgstr "Nemohu se připojit k %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Nemohu přistoupit ke klíčence: '%s'" +msgstr "Nemohu přistoupit ke klíčence: „%s“" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliÅ¡ dlouhý. Končím." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" +"Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouÅ¡tění gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1935,428 +1979,453 @@ msgstr "Nemohu otevřít rouru pro %s" msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Čas spojení vyprÅ¡el" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Nelze zmenÅ¡it soubor" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Å patné datové záhlaví" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Vnitřní chyba" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Nemohu provést mmap prázdného souboru" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "NeÅ¡lo mmapovat %lu bajtů" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nerozpoznaná zkratka typu: '%c'" +msgstr "Nerozpoznaná zkratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Řádek %d je příliÅ¡ dlouhý (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: PříliÅ¡ mnoho vnořených propojení (include)" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'" +msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Parametr příkazové řádky '%c' [z %s] je neznámý" +msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Nerozumím parametru %s příkazové řádky" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Parametr příkazové řádky %s není pravdivostní hodnota" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Volba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne '%s'" +msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Volba '%s' je příliÅ¡ dlouhá" +msgstr "Volba „%s“ je příliÅ¡ dlouhá" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nechápu význam %s, zkuste true nebo false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operace %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Nemohu přejít do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "NeÅ¡lo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache balíků je prázdná" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Cache soubor balíků je poÅ¡kozen" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Cache soubor balíků je v nekompatibilní verzi" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Tento APT nepodporuje systém pro správu verzí '%s'" +msgstr "Tato APT nepodporuje systém pro správu verzí „%s“" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Předzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Doporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrazuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarává" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "PoruÅ¡uje" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "důležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "vyžadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardní" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "volitelný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Čtu stavové informace" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Nelze otevřít stavový soubor %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Nelze zapsat dočasný stavový soubor %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliÅ¡ dlouhý." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" +msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2367,18 +2436,18 @@ msgstr "" "smyčce v Conflicts/Pre-Depends. To je často Å¡patné, ale pokud to skutečně " "chcete udělat, aktivujte možnost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Indexový typ souboru '%s' není podporován" +msgstr "Indexový typ souboru „%s“ není podporován" -#: apt-pkg/algorithms.cc:241 +#: 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 "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2386,184 +2455,206 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " +"použity starší verze." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Stahuji soubor %li z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ovladač metody %s nemohl být nalezen." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuÅ¡těna správně" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." +msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Balíčkovací systém '%s' není podporován" +msgstr "Balíčkovací systém „%s“ není podporován" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nebylo možno vyhodnotit %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Do sources.list musíte zadat 'zdrojové' URI" +msgstr "Do sources.list musíte zadat „zdrojové“ URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache má nekompatibilní systém správy verzí" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat." +msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." +msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat." +msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "NeÅ¡lo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Neshoda kontrolních součtů" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2572,7 +2663,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2581,14 +2672,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou naruÅ¡eny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2597,7 +2688,7 @@ msgstr "Velikosti nesouhlasí" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2606,151 +2697,218 @@ msgstr "" "Používám přípojný bod %s\n" "Připojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Rozpoznávám... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Odpojuji CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Čekám na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Nalezl jsem indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a " +"podpisy (%zu)\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Nalezený název: „%s“\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" "Tento disk se nazývá: \n" -"'%s'\n" +"„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Odpojuji CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsal jsem %i záznamů.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Instaluji %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Nastavuji %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Odstraňuji %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "SpouÅ¡tím poinstalační spouÅ¡těč %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Adresář „%s“ chybí" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Nastavuji %s" +msgid "Processing triggers for %s" +msgstr "Zpracovávám spouÅ¡těče pro %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Odstraňuji %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Nemohu otevřít soubor %s" +msgstr "Nemohu záplatovat soubor" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Dynamickému MMapu doÅ¡lo místo" + +#~ 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 "" +#~ "Protože jste požádali pouze o jednoduchou operaci, je téměř jisté, že\n" +#~ "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" +#~ "(bug report)." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Řádek %d je příliÅ¡ dlouhý (max %lu)" + +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Řádek %d je příliÅ¡ dlouhý (max %d)" + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)" + +#~ msgid "Stored label: %s \n" +#~ msgstr "Uložený název: %s \n" + +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i), indexy překladů (%i) " +#~ "a podpisy (%i)\n" + #~ msgid "File date has changed %s" #~ msgstr "Datum souboru se změnil %s" diff --git a/po/cy.po b/po/cy.po index 14d749f..67608e9 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -14,162 +14,172 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 #, fuzzy -msgid "Total package names : " +msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Cyfanswm Fersiynau Gwahanol: " + +#: cmdline/apt-cache.cc:297 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " + +#: cmdline/apt-cache.cc:304 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -193,8 +203,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -230,7 +240,7 @@ msgstr "" " 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" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -241,7 +251,7 @@ msgstr "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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" #: cmdline/apt-cdrom.cc:78 @@ -324,7 +334,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -333,32 +343,32 @@ msgstr "Ni ellir ysgrifennu i %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -440,308 +450,308 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Methodd stat() o %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, fuzzy, c-format msgid "Internal error, could not locate member %s" msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "datgywasgydd" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:550 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -751,147 +761,147 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -902,29 +912,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -932,49 +942,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -986,77 +996,119 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " -"rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: cmdline/apt-get.cc:1468 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Methwyd canfod pecyn %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1065,7 +1117,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1077,132 +1129,118 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -# FIXME: commas, wrapping -#: cmdline/apt-get.cc:1569 -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 "" -"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" -"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1211,7 +1249,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1220,34 +1258,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1263,6 +1301,8 @@ msgid "" " 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" @@ -1278,7 +1318,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1400,24 +1440,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Rhagosodiad gwael!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Gwasgwch Enter er mwyn mynd ymlaen." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1429,197 +1473,197 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Llofnod archif annilys" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Mae'r archif yn rhy fyr" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Methyd lleoli yr elfen !" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 #, fuzzy msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" # FIXME: "the" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Ni ellir darllen %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Methwyd dileu %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ni ellir creu %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Methwyd stat() ar %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" # FIXME -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 #, fuzzy msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 #, fuzzy msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1630,82 +1674,82 @@ msgstr "" "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" # FIXME -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 #, fuzzy msgid "Internal error getting a node" msgstr "Gwall Mewnol wrth gael Nôd" # FIXME: literal -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Mae'r ffeil dargyfeirio wed ei lygru" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Llinell annilys yn y ffeil dargyfeirio: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 #, fuzzy msgid "Internal error adding a diversion" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 #, fuzzy msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, fuzzy, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, fuzzy, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 #, fuzzy msgid "Internal error, could not locate member" msgstr "Gwall Methwyd, methwyd lleoli aelod" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -1729,28 +1773,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD Anghywir" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Methwyd stat()" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1813,7 +1856,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1825,7 +1868,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1881,7 +1924,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1909,59 +1952,59 @@ msgstr "Ymholiad" msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Methwyd cysylltu i %s %s:" @@ -1971,34 +2014,34 @@ msgstr "Methwyd cysylltu i %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Methwyd datrys '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2014,446 +2057,473 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:584 +#: methods/http.cc:586 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:599 +#: methods/http.cc:601 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:601 +#: methods/http.cc:603 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:873 +#: methods/http.cc:875 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: methods/http.cc:1105 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linell %d yn rhy hir (uchaf %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" # FIXME -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Ni ellir newid i %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Yn cyfuno manylion Ar Gael" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Methwyd agor %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Methwyd ysgrifennu ffeil %s" + # FIXME: number? -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, fuzzy, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2464,12 +2534,12 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2477,7 +2547,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2485,44 +2555,52 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2530,146 +2608,165 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." # FIXME: ...file -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:189 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Camgyfatebiaeth swm MD5" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2678,7 +2775,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2687,14 +2784,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2703,149 +2800,182 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Wedi Sefydlu: " + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Yn agor %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." + +#: apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" +msgid "Processing triggers for %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" @@ -2855,6 +2985,35 @@ msgstr "Methwyd agor ffeil %s" msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +# FIXME: commas, wrapping +#~ 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 "" +#~ "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" +#~ "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linell %d yn rhy hir (uchaf %d)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linell %d yn rhy hir (uchaf %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Methwyd dewis" + #~ msgid "File date has changed %s" #~ msgstr "Dyddiad ffeil wedi newid %s" diff --git a/po/da.po b/po/da.po index e423e4e..a7e1867 100644 --- a/po/da.po +++ b/po/da.po @@ -4,13 +4,13 @@ # Danish messages # # Claus Hindsgaul , 2002,2003, 2004, 2005, 2006. -# Claus Hindsgaul , 2006. +# Claus Hindsgaul , 2006, 2007. msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-06 15:57+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -19,147 +19,156 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n" +msgstr " %s and %s/%s" msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbelt tilføjelse af omrokering %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkede %s ud flere gange" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Mappen %s er omrokeret" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Omrokeringsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappen %s bliver erstattet af en ikke-mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Kunne ikke finde knuden i sin hash-bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overskriv pakkematch uden version for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Kunne ikke læse %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kunne ikke finde %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Kunne ikke slette %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kunne ikke oprette %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Kunne ikke finde %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Indlæser pakkelisterne" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Kunne ikke skifte til admin-mappen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Intern fejl under hentning af et pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Læser fillisten" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1577,78 +1625,79 @@ msgstr "" "kan du gøre dem tom og med det samme geninstallere den samme version af " "pakken!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Kunne ikke læse listefilen %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern fejl under hentning af knude" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Pakkeomrokeringsfilen er ødelagt" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ugyldig linje i omrokeringsfilen: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Intern fejl under tilføjelse af omrokering" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres først" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fejl under tolkning af MD5. Forskydning %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Dette er ikke et gyldigt DEB-arkiv, det har intet'%s- eller %s-elementet" +"Dette er ikke et gyldigt DEB-arkiv, det har intet''%s', '%s' eller '%s'-" +"elementet" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Kunne ikke skifte til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Intern fejl, kunne ikke finde element" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Kunne ikke finde en gyldig kontrolfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Ikke-tolkbar kontrolfil" @@ -1669,26 +1718,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Forkert cd" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Kunne ikke finde" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -1750,7 +1798,7 @@ msgstr "Tidsudl msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Læsefejl" @@ -1762,7 +1810,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -1816,7 +1864,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1843,59 +1891,59 @@ msgstr "Foresp msgid "Unable to invoke " msgstr "Kunne ikke udføre " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Forbinder til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omsætte navnet '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omsætning af navnet '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Der skete noget underligt under navneomsætning af '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" @@ -1905,35 +1953,35 @@ msgstr "Kunne ikke forbinde til %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Kunne ikke tilgå nøgleringent '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Stødte på mindst én ugyldig signatur." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Kunne ikke køre '%s' for at verificere signaturen (er gnupg installeret?)" +"Kunne ikke køre '%s' for at verificere signaturen (er gpgv installeret?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved kørsel af gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Følgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1951,428 +1999,454 @@ msgstr "Kunne ikke msgid "Read error from %s process" msgstr "Læsefejl fra %s-process" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet på over %u tegn" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Kunne ikke skrive filen %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Intern fejl" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Kan ikke udføre mmap for en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udføre mmap for %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Åbner konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linjen %d er for lang (må højst være %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fejl!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Færdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Kommandolinjetilvalget %s blev ikke forstået" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjetilvalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Tilvalget %s kræver et parameter." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tilvalget %s kræver et heltalligt parameter, ikke '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Tilvalget '%s' er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s blev ikke forstået, prøv med 'true' eller 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig handling %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Kunne ikke skifte til %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åbne låsefilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opnå låsen %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "læs, mangler stadig at læse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakke-mellemlager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakke-mellemlagerets fil er ødelagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understøtter ikke versionssystemet '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Afhængigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Præ-afhængigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslåede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefalede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikter" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Overflødiggør" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Ødelægger" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "vigtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "krævet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "frivillig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Afhængighedsgenerering" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Læser tilstandsoplysninger" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Kunne ikke åbne StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Kunne ikke skrive den midlertidige StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2384,19 +2458,19 @@ msgstr "" "idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-" "LoopBreak'." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen '%s' understøttes ikke" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2404,185 +2478,210 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " +"bruges i stedet." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappen %spartial mangler." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li ud af %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kunne ikke finde %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du skal have nogle 'source'-URI'er i din sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forstå pin-type %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 #, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5Sum stemmer ikke" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2591,7 +2690,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2600,13 +2699,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" @@ -2615,7 +2714,7 @@ msgstr "St msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2624,47 +2723,60 @@ msgstr "" "Bruger cdrom-monteringspunktet %s\n" "Monterer cdrom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificerer.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Gemt mærkat: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Afmonterer cdrom...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Venter på disken...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Fandt %i pakkeindekser, %i kildeindekser, %i oversættelsesindekser og %i " +"signaturer\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" +msgid "Found label '%s'\n" +msgstr "Fandt mærkatet '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2673,92 +2785,113 @@ msgstr "" "Denne disk hedder: \n" " %s \n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Afmonterer cdrom..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Installerede %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Sætter %s op" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Fjerner %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Listemappen %spartial mangler." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Klargør %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Gør klar til at sætte %s op" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "Sætter %s op" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "Fejl under behandling af mappen %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Gør klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Fjerner %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Kunne ikke påføre filen %s en lap" @@ -2767,6 +2900,47 @@ msgstr "Kunne ikke p msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#~ 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 "" +#~ "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt " +#~ "slet\n" +#~ "ikke installeres og du bør indsende en fejlrapport for denne pakke." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linjen %d er for lang (maks %u)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linjen %d er for lang (maks %u)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Gemt mærkat: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Fandt %i pakkeindekser, %i kildeindekser, %i oversættelsesindekser og %i " +#~ "signaturer\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Valg mislykkedes" + #~ msgid "File date has changed %s" #~ msgstr "Filens dato er ændret %s" diff --git a/po/de.po b/po/de.po index 0db6e98..e19631f 100644 --- a/po/de.po +++ b/po/de.po @@ -1,159 +1,169 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. +# Holger Wansing , 2008. +# Jens Seidel , 2008. # Michael Piefel , 2001, 2002, 2003, 2004, 2006. # Rüdiger Kuhlmann , 2002. -# +# msgid "" msgstr "" -"Project-Id-Version: apt 0.6.46.2\n" +"Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-24 11:45+0200\n" -"Last-Translator: Michael Piefel \n" -"Language-Team: \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 21:31+0100\n" +"Last-Translator: Holger Wansing \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\n" +msgstr "Paket %s Version %s hat eine nicht erfüllte Abhängigkeit:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Kann Paket %s nicht finden" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Gesamtzahl an Paketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " davon gewöhnliche Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " davon rein virtuelle Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " davon einzelne virtuelle Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " davon gemischte virtuelle Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " davon fehlend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Gesamtzahl an unterschiedlichen Versionen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Gesamtzahl an Abhängigkeiten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Gesamtzahl an Version/Datei-Beziehungen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Gesamtzahl an Bereitstellungen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Gesamtzahl an Mustern: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Gesamtmenge an Slack: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Sie müssen genau ein Muster angeben" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Festgehaltene Pakete („Pin“):" +msgstr "Per Pinning verwaltete Pakete:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nicht gefunden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " -msgstr " Installiert:" +msgstr " Installiert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(keine)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " -msgstr " Mögliche Pakete:" +msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Paketstecknadel: " +msgstr " Paket-Pinning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versions-Tabelle:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s für %s %s kompiliert am %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s für %s, kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -192,16 +202,16 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "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" +" apt-cache [Optionen] add datei1 [datei2 ...]\n" +" apt-cache [Optionen] showpkg paket1 [paket2 ...]\n" +" apt-cache [Optionen] showsrc paket1 [paket2 ...]\n" "\n" "apt-cache ist ein Low-Level-Werkzeug, um die binären Cache-Dateien von\n" "APT zu manipulieren und Informationen daraus zu erfragen.\n" "\n" "Befehle:\n" -" add – Paket-Datei dem Quellcache hinzufügen\n" -" gencaches – Paket- und Quellcache neu erzeugen\n" +" add – Paket-Datei dem Quell-Cache hinzufügen\n" +" gencaches – Paket- und Quell-Cache neu erzeugen\n" " showpkg – grundsätzliche Informationen für ein einzelnes Paket zeigen\n" " showsrc – Aufzeichnungen zu Quellen zeigen\n" " stats – einige grundlegenden Statistiken zeigen\n" @@ -212,27 +222,26 @@ msgstr "" " show – einen lesbaren Datensatz für das Paket zeigen\n" " depends – normale Abhängigkeitsinformationen für ein Paket zeigen\n" " rdepends – umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n" -" pkgnames – alle Paketnamen auflisten\n" +" pkgnames – die Namen aller Pakete im System auflisten\n" " dotty – einen Paketgraph zur Verwendung mit GraphViz erzeugen\n" " xvcg – einen Paketgraph zur Verwendung mit xvcg erzeugen\n" -" policy – „policy“-Einstellungen zeigen\n" +" policy – »policy«-Einstellungen zeigen\n" "\n" "Optionen:\n" " -h dieser Hilfe-Text.\n" -" -p=? der Paketcache.\n" -" -s=? der Quellcache.\n" +" -p=? der Paket-Cache.\n" +" -s=? der Quell-Cache.\n" " -q Fortschrittsanzeige abschalten\n" -" -i nur wichtige Abhängigkeiten für den „unmet“-Befehl zeigen\n" +" -i nur wichtige Abhängigkeiten für den »unmet«-Befehl zeigen\n" " -c=? diese Konfigurationsdatei lesen\n" -" -o=? eine beliebige Konfigurations-Option setzen, z. B. -o dir::cache=/" -"tmp\n" -"Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n" +" -o=? eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/tmp\n" +"Weitere Informationen finden Sie unter apt-cache(8) und 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 "" -"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel „Debian 2.2r1 " -"Disk 1“" +"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.1r1 " +"Disk 1«" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -241,8 +250,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" -"Wiederholen Sie dieses Prozedere für die restlichen CDs in Ihres Satzes." +msgstr "Wiederholen Sie dieses Prozedere für die restlichen CDs Ihres Satzes." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -270,7 +278,7 @@ msgstr "" "\n" "Befehle:\n" " shell – Shell-Modus\n" -" dump – Die Konfiguration ausgeben\n" +" dump – Die Konfiguration ausgeben\n" "\n" "Optionen:\n" " -h Dieser Hilfetext\n" @@ -309,7 +317,7 @@ msgstr "" " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@ -318,31 +326,31 @@ msgstr "Kann nicht nach %s schreiben" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Paketerweiterungsliste ist zu lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Fehler beim Verarbeiten von Verzeichnis %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Fehler beim Schreiben des Headers in die Inhaltsdatei" +msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -383,13 +391,13 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Aufruf: apt-ftparchive [optionen] befehl\n" -"Befehle: packages binarypath [overridedatei [pfadpräfix]]\n" -" sources srcpath [overridedatei [pfadpräfix]]\n" -" contents path\n" -" release path\n" -" generate config [gruppen]\n" -" clean config\n" +"Aufruf: apt-ftparchive [optionen] befehl\n" +"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n" +" sources Quellpfad [Override-Datei [Pfadpräfix]]\n" +" contents Pfad\n" +" release Pfad\n" +" generate Konfigurationsdatei [Gruppen]\n" +" clean Konfigurationsdatei\n" "\n" "apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt " "viele\n" @@ -410,45 +418,45 @@ msgstr "" "Override-\n" "Datei für Quellen anzugeben.\n" "\n" -"Die Befehle „packages“ und „source“ sollten in der Wurzel des Baumes " +"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " "aufgerufen\n" -"werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n" -"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" +"werden. Binärpfad sollte auf die Basis der rekursiven Suche zeigen und\n" +"Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Optionen:\n" -" -h dieser Hilfe-Text\n" -" --md5 MD5-Hashes erzeugen\n" -" -s=? Override-Datei für Quellen\n" -" -q ruhig\n" -" -d=? optionale Cache-Datenbank auswählen\n" +" -h dieser Hilfe-Text\n" +" --md5 MD5-Hashes erzeugen\n" +" -s=? Override-Datei für Quellen\n" +" -q ruhig\n" +" -d=? optionale Cache-Datenbank auswählen\n" " --no-delink Debug-Modus für Delinking setzen\n" " --contents Inhaltsdatei erzeugen\n" -" -c=? diese Konfigurationsdatei lesen\n" -" -o=? eine beliebige Konfigurations-Option setzen" +" -c=? diese Konfigurationsdatei lesen\n" +" -o=? eine beliebige Konfigurationsoption setzen" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Keine Auswahl passt" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Einige Dateien fehlen in der Paketdateigruppe „%s“" +msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB wurde beschädigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ist alt, versuche %s zu erneuern" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -456,424 +464,424 @@ msgstr "" "DB-Format ist ungültig. Wenn Sie ein Update von einer älteren Version von " "apt gemacht haben, entfernen Sie bitte die Datenbank und erstellen sie neu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kann DB-Datei %s nicht öffnen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Kann auf %s nicht zugreifen." +msgstr "Konnte kein »stat« auf %s durchführen." -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archiv hat keinen Steuerungs-Datensatz" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kann keinen Cursor bekommen" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kann Verzeichnis %s nicht lesen\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Kann nicht zugreifen auf %s\n" +msgstr "W: Kann kein »stat« auf %s durchführen\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Konnte %s nicht auflösen" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Baumabschreiten fehlgeschlagen" +msgstr "Verzeichniswechsel im Verzeichnisbaum fehlgeschlagen" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Konnte %s nicht öffnen" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Kann kein readlink auf %s durchführen" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Konnte %s nicht entfernen (unlink)" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s-Maintainer ist %s und nicht %s\n" +msgstr " %s-Betreuer ist %s und nicht %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interner Fehler, konnte Bestandteil %s nicht finden" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc – Speicheranforderung fehlgeschlagen" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kann %s nicht öffnen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Missgestaltetes Override %s Zeile %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Missgestaltetes Override %s Zeile %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Missgestaltetes Override %s Zeile %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Konnte die Override-Datei %s nicht lesen." -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Unbekannter Komprimierungsalgorithmus „%s“" +msgstr "Unbekannter Komprimierungsalgorithmus »%s«" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimierte Ausgabe %s braucht einen Komprimierungs-Satz" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht erzeugen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Konnte FILE* nicht erzeugen" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Fork Fehlgeschlagen" +msgstr "Fork fehlgeschlagen" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Kindprozess Komprimieren" +msgstr "Komprimierungskindprozess" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Interner Fehler, konnte %s nicht erzeugen" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht erzeugen" +msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht herstellen" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Konnte Komprimierer nicht ausführen" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "Dekomprimierer" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Kann nicht lesen während der MD5-Berechnung" +msgstr "Konnte während der MD5-Berechnung nicht lesen" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Unlinking von %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:" +msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" -msgstr " oder " +msgstr " oder" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" -"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" +"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Abhängigkeit werden korrigiert..." +msgstr "Abhängigkeiten werden korrigiert..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" +msgstr "Kann die Menge zu aktualisierender Pakete nicht minimieren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren." +msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." +msgstr "Nicht erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 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:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" +msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." +msgstr "Kann das Downloadverzeichnis nicht sperren." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 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 " +"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" +msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Es müssen %sB Archive geholt werden.\n" +msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" +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:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation." +msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "Ja, tu was ich sage!" +msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -881,80 +889,80 @@ msgid "" " ?] " msgstr "" "Sie sind im Begriff, etwas potenziell Schädliches zu tun.\n" -"Zum Fortfahren geben Sie bitte „%s“ ein.\n" +"Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" +msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Konnte einige Archive nicht herunterladen, vielleicht „apt-get update“ oder " -"mit „--fix-missing“ probieren?" +"Konnte einige Archive nicht herunterladen; vielleicht »apt-get update« " +"ausführen oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Achtung, wähle %s an Stelle von %s\n" +msgstr "Hinweis: wähle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, 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" +"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, 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:1069 +#: cmdline/apt-get.cc:1092 #, 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:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,85 +973,131 @@ 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:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -"Re-Installation von %s ist nicht möglich,\n" +"Erneute Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release „%s“ für „%s“ konnte nicht gefunden werden" +msgstr "Release »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Version „%s“ für „%s“ konnte nicht gefunden werden" +msgstr "Version »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" -msgstr "Der Befehl „update“ nimmt keine Argumente" +msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" +msgstr "Kann das Listenverzeichnis nicht sperren" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +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:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " -"ignoriert oder alte an ihrer Stelle benutzt." +"Die folgenden Pakete wurden automatisch installiert und werden nicht länger " +"benötigt:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." + +#: 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, es sieht so aus, als ob der AutoRemover etwas zerstört hat, was\n" +"wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n" +"gegen 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 "" +"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Konnte Task %s nicht finden" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n" +msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s wurde als manuell installiert festgelegt.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:" +msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne " -"jeglich Pakete (oder geben Sie eine Lösung an)." +"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:1561 +#: 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" @@ -1053,180 +1107,165 @@ msgstr "" "Einige Pakete konnten nicht installiert werden. Das kann bedeuten, dass\n" "Sie eine unmögliche Situation angefordert haben oder dass, wenn Sie die\n" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" -"kreiert oder aus Incoming herausbewegt wurden." - -#: cmdline/apt-get.cc:1569 -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 und eine Fehlermeldung über\n" -"dieses Paket erfolgen sollte." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" +"erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "Berechne Upgrade..." +msgstr "Berechne Upgrade (Paketaktualisierung) ..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 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:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Überspringe schon heruntergeladene Datei „%s“\n" +msgstr "Überspringe schon heruntergeladene Datei »%s«\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, 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:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" +msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Es müssen %sB der Quellarchive geholt werden.\n" +msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, 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:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" +msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n" +msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" +msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" +"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." +msgstr "" +"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s hat keine Build-Dependencies.\n" +msgstr "%s hat keine Bau-Abhängigkeiten.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " -"gefunden werden kann." +"%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden " +"werden kann." -#: cmdline/apt-get.cc:2282 +#: 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 Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " +"%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:2317 +#: cmdline/apt-get.cc:2503 #, 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:2342 +#: cmdline/apt-get.cc:2530 #, 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:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden." +msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" +msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1241,6 +1280,8 @@ msgid "" " 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" @@ -1256,7 +1297,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1267,47 +1308,53 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Aufruf: apt-get [Optionen] Befehl\n" -" apt-get [Optionen] install|remove pkg1 [pkg2 ...]\n" -" apt-get [Optionen] source pkg1 [pkg2 ...]\n" +"Aufruf: apt-get [Optionen] befehl\n" +" apt-get [Optionen] install|remove paket1 [paket2 ...]\n" +" apt-get [Optionen] source paket1 [paket2 ...]\n" "\n" "apt-get ist ein einfaches Kommandozeilenwerkzeug zum Herunterladen\n" "und Installieren von Paketen. Die am häufigsten benutzten Befehle\n" "sind update und install.\n" "\n" "Befehle:\n" -" update – neue Liste von Paketen einlesen\n" -" upgrade – eine Paketaktualisierung durchführen\n" -" install – neue Pakete installieren (pkg ist libc6 und nicht libc6." +" update – neue Paketinformationen einlesen\n" +" upgrade – ein Upgrade (Paketaktualisierung) durchführen\n" +" install – neue Pakete installieren (paket ist libc6, nicht libc6." "deb)\n" -" remove – Pakete entfernen\n" -" source – Quellarchive herunterladen\n" -" build-dep – die Build-Abhängigkeiten für Quellpakete konfigurieren\n" -" dist-upgrade – „Distribution upgrade“, siehe apt-get(8)\n" -" dselect-upgrade – der Auswahl aus „dselect“ folgen\n" -" clean – heruntergeladene Archive löschen\n" -" autoclean – veraltete heruntergeladene Archive löschen\n" -" check – überprüfen, dass es keine nicht erfüllten Abhängigkeiten " -"gibt\n" +" remove – Pakete entfernen\n" +" autoremove – alle nicht mehr verwendeten Pakete automatisch " +"entfernen\n" +" purge – entferne Pakete restlos\n" +" source – Quellarchive herunterladen\n" +" build-dep – die Bau-Abhängigkeiten für Quellpakete konfigurieren\n" +" dist-upgrade – spezielles Upgrade (Paketaktualisierung) für die " +"komplette\n" +" Distribution durchführen, siehe apt-get(8)\n" +" dselect-upgrade – der Auswahl von »dselect« folgen\n" +" clean – heruntergeladene Archive löschen\n" +" autoclean – veraltete heruntergeladene Archive löschen\n" +" check – überprüfen, dass es keine nicht-erfüllten " +"Abhängigkeiten\n" +" gibt\n" "\n" "Optionen:\n" " -h dieser Hilfetext\n" -" -q protokollierbare (logbare) Ausgabe – keine Fortschrittsanzeige\n" +" -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" " -qq keine Ausgabe außer bei Fehlern\n" " -d nur herunterladen – Archive NICHT installieren oder entpacken\n" " -s nichts tun; nur eine Simulation der Vorgänge durchführen\n" -" -y für alle Antworten „Ja“ annehmen und nicht nachfragen\n" -" -f versuchen fortzufahren, wenn die Integritätsüberprüfung fehlschlägt\n" +" -y für alle Antworten »Ja« annehmen und nicht nachfragen\n" +" -f versuchen, ein System mit defekten Abhängigkeiten zu korrigieren\n" " -m versuchen fortzufahren, wenn Archive nicht auffindbar sind\n" " -u auch eine Liste der aktualisierten Pakete mit anzeigen\n" " -b ein Quellpaket nach dem Herunterladen übersetzen\n" " -V ausführliche Versionsnummern anzeigen\n" " -c=? Diese Konfigurationsdatei benutzen\n" -" -o=? Beliebige Konfigurationsoptionen setzen, z. B. -o dir::cache=/tmp\n" +" -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" "Siehe auch die Handbuch-Seiten apt-get(8), sources.list(5) und apt.conf(5) " "für\n" "weitergehende Informationen und Optionen.\n" -" Dieses APT hat Super-Kuh-Kräfte.\n" +" Dieses APT hat Super-Kuh-Kräfte.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1333,7 +1380,7 @@ msgstr "Es wurden %sB in %s geholt (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Arbeite]" +msgstr " [Verarbeite]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1343,8 +1390,8 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" -" „%s“\n" -"in Laufwerk „%s“ und drücken Sie die Eingabetaste.\n" +" »%s«\n" +"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1366,7 +1413,7 @@ msgstr "" "Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n" "\n" "apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n" -"Option -d wird benutzt, um anzuzeigen, um was für eine Datei es sich " +"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich " "handelt.\n" "\n" "Optionen:\n" @@ -1377,306 +1424,310 @@ msgstr "" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Fehlerhafte Voreinstellung" +msgstr "Fehlerhafte Voreinstellung!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Zum Fortfahren Enter drücken." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Möchten Sie alle bisher heruntergeladenen .deb-Dateien löschen?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Einige Fehler traten während des Entpackens auf. Ich werde die installierten" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "Pakete konfigurieren. Dies kann zu doppelten Fehlermeldungen oder Fehlern " "durch" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler über " "dieser" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"Meldung sind wichtig. Bitte beseitigen Sie sie und [I]nstallieren erneut." +"Meldung sind wichtig. Bitte beseitigen Sie sie und [I]nstallieren Sie erneut." #: dselect/update:30 msgid "Merging available information" -msgstr "Führe Information zur Verfügbarkeit zusammen" +msgstr "Führe verfügbare Information zusammen" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Konnte Weiterleitungen nicht erzeugen" +msgstr "Konnte Pipes (Weiterleitungen) nicht erzeugen" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Konnte gzip nicht ausführen" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "Korrumpiertes Archiv" +msgstr "Beschädigtes Archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert" +msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s" +msgstr "Unbekannter Tar-Header-Typ %u, Bestandteil %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ungültige Archiv-Signatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Fehler beim Lesen der Archivdateienkopfzeilen" +msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Ungültige Archivdateikopfzeile" +msgstr "Ungültige Archivdatei-Kopfzeilen" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archiv ist zu kurz" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Konnte Archivköpfe nicht lesen." +msgstr "Konnte Archiv-Kopfzeilen nicht lesen" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "„DropNode“ auf noch verlinktem Knoten aufgerufen" +msgstr "»DropNode« auf noch verknüpftem Knoten aufgerufen" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Konnte Hash-Element nicht finden!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Konnte Umleitung nicht reservieren" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "Interner Fehler in „AddDiversion“" +msgstr "Interner Fehler in »AddDiversion«" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Versuche, Umleitung zu überschreiben: %s -> %s und %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Konnte Datei %s nicht schreiben" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Konnte Datei %s nicht schließen" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Der Pfad %s ist zu lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Packe %s mehr als einmal aus" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Das Verzeichnis %s ist umgeleitet" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Das Paket versucht, auf das Umleitungsziel %s/%s zu schreiben" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Der Umleitungspfad ist zu lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Konnte Knoten nicht in seinem Hash finden" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Der Pfad ist zu lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Überschreibe Paket-Treffer ohne Version für %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Kann %s nicht lesen" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Kann nicht auf %s zugreifen" +msgstr "Kann kein »stat« auf %s durchführen" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Konnte %s nicht entfernen" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Konnte %s nicht erzeugen" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Kann nicht auf %sinfo zugreifen" +msgstr "Konnte kein »stat« auf %sinfo durchführen" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "" -"Die „info“- und „temp“-Verzeichnisse müssen im selben Dateisystem liegen" +msgstr "Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Paketlisten werden gelesen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Kann nicht ins Administrationsverzeichnis %sinfo wechseln" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Interner Fehler beim Holen des Paket-Namens" +msgstr "Interner Fehler beim Holen des Paketnamens" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Fehler beim Öffnen der Listendatei „%sinfo/%s“. Wenn Sie diese Datei nicht " +"Fehler beim Öffnen der Listendatei »%sinfo/%s«. Wenn Sie diese Datei nicht " "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort " "dieselbe Version des Paketes erneut!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Fehler beim Lesen der Listendatei „%sinfo/%s“." +msgstr "Fehler beim Lesen der Listendatei »%sinfo/%s«." -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Interner Fehler beim Holen eines Knotens" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Fehler beim Öffnen der Umleitungsdatei %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Die Umleitungsdatei ist korrumpiert" +msgstr "Die Umleitungsdatei ist beschädigt" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ungültige Zeile in der Umleitungsdatei: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Interner Fehler beim Hinzufügen einer Umleitung" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Der Paketcache muss erst initialisiert werden" +msgstr "Der Paket-Cache muss erst initialisiert werden" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Konnte keine „Package:“-Kopfzeile finden, Abstand %lu" +msgstr "Konnte keine »Package:«-Kopfzeile finden, Offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Fehlerhafter „ConfFile“-Abschnitt in der Statusdatei, Abstand %lu" +msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Fehler beim Parsen der MD5-Summe. Abstand %lu" +msgstr "Fehler beim Verarbeiten der MD5-Summe. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält" +msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Dies ist kein gültiges DEB-Archiv, da es weder „%s“ noch „%s“ enthält" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Dies ist kein gültiges DEB-Archiv, da es weder »%s«, »%s« noch »%s« enthält" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Konnte nicht in %s wechseln" +msgstr "Konnte nicht in %s wechseln" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Interner Fehler, konnte Bestandteil nicht finden" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Konnte gültige Kontroll-Datei nicht finden" +msgstr "Konnte gültige »control«-Datei nicht finden" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Unparsbare Kontroll-Datei" +msgstr "Nicht einlesbare »control«-Datei" #: methods/cdrom.cc:114 #, c-format @@ -1688,42 +1739,41 @@ msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen. apt-" -"get update kann nicht dazu verwendet werden, neue CDs hinzuzufügen" +"Bitte verwenden Sie apt-cdrom, um diese CD-ROM für APT erkennbar zu machen. " +"apt-get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Falsche CD" +msgstr "Falsche CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch " "verwendet." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk nicht gefunden." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Kann nicht zugreifen." +msgstr "Konnte kein »stat« durchführen." -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Ungültige URI, lokale URIs dürfen nicht mit // anfangen" +msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1764,7 +1814,7 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Befehl „%s“ des Einlogg-Skriptes ist fehlgeschlagen: %s" +msgstr "Befehl »%s« des Einlog-Skriptes ist fehlgeschlagen: %s" #: methods/ftp.cc:291 #, c-format @@ -1779,50 +1829,49 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Der Server hat die Verbindung geschlossen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Eine Antwort hat einen Puffer zum Überlaufen gebracht." +msgstr "Eine Antwort hat den Puffer zum Überlaufen gebracht." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokollkorrumption" +msgstr "Protokoll beschädigt" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Konnte keinen Verbindungsendpunkt erzeugen" +msgstr "Konnte kein Socket erzeugen" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Konnte Verbindungsendpunkt wegen Zeitüberschreitung nicht verbinden" +msgstr "Konnte Daten-Socket wegen Zeitüberschreitung nicht verbinden" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Konnte passiven Verbindungsendpunkt nicht verbinden." +msgstr "Konnte passiven Socket nicht verbinden." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "" -"Die Funktion getaddrinfo konnte keinen passiven Verbindungsendpunkt finden" +msgstr "Die Funktion getaddrinfo konnte keinen lauschenden Socket finden" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Konnte einen Verbindungsendpunkt nicht verbinden" +msgstr "Konnte ein Socket nicht verbinden" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Konnte auf dem Verbindungsendpunkt nicht lauschen" +msgstr "Konnte auf dem Socket nicht lauschen" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Konnte den Namen das Verbindungsendpunktes nicht bestimmen" +msgstr "Konnte den Namen des Sockets nicht bestimmen" #: methods/ftp.cc:779 msgid "Unable to send PORT command" @@ -1846,14 +1895,14 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Kann Datei nicht holen, Server antwortete „%s“" +msgstr "Kann Datei nicht holen, Server antwortete: »%s«" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1862,7 +1911,7 @@ msgstr "Datenverbindung erlitt Zeitüberschreitung" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datenübertragung fehlgeschlagen, Server antwortete „%s“" +msgstr "Datenübertragung fehlgeschlagen, Server antwortete: »%s«" #. Get the files information #: methods/ftp.cc:997 @@ -1873,100 +1922,101 @@ msgstr "Abfrage" msgid "Unable to invoke " msgstr "Kann nicht aufrufen: " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Verbinde mit %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Kann keinen Verbindungsendpunkt für %s (f=%u t=%u p=%u)" +msgstr "Konnte kein Socket für %s erzeugen (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -"Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)" +"Konnte keine Verbindung mit %s:%s aufbauen (%s), eine Zeitüberschreitung " +"trat auf" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Konnte nicht mit %s:%s verbinden (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Konnte „%s“ nicht auflösen" +msgstr "Konnte »%s« nicht auflösen" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Temporärer Fehlschlag beim Auflösen von „%s“" +msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Beim Auflösen von „%s:%s“ ist etwas Schlimmes passiert (%i)" +msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Kann nicht mit %s:%s verbinden:" +msgstr "Kann nicht mit %s %s verbinden:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Konnte nicht auf Schlüsselring zugreifen: „%s“" +msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Argumentliste von Acquire::gpgv::Options zu lang. Breche ab." +msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des " "Schlüssels nicht ermitteln?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Konnte „%s“ zum Überprüfen der Signatur nicht ausführen (ist gnupg " +"Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv " "installiert?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1978,438 +2028,463 @@ msgstr "" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Konnte keine Pipe für %s öffnen" +msgstr "Konnte keine Pipe (Weiterleitung) für %s öffnen" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Warte auf Kopfzeilen (header)" +msgstr "Warte auf Kopfzeilen" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" -msgstr "Schlechte Kopfzeile" +msgstr "Ungültige Kopfzeile" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" +msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile" +msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile" +msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." +msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft." -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Fehler beim Schreiben einer Ausgabedatei" +msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " +"Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Konnte Datei nicht einkürzen" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Interner Fehler" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Kann eine leere Datei nicht mit mmap abbilden" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nicht erkannte Typabkürzung: „%c“" +msgstr "Nicht erkannte Typabkürzung: »%c«" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Zeile %d zu lang (maximal %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, 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:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, 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:684 +#: apt-pkg/contrib/configuration.cc:738 #, 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:691 +#: apt-pkg/contrib/configuration.cc:745 #, 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:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaxfehler %s:%u: Einbindung von here" +msgstr "Syntaxfehler %s:%u: Eingefügt von hier" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“" +msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fehler!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fertig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Kommandozeilenoption „%c“ [aus %s] ist nicht bekannt." +msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Kommandozeilenoption %s wird nicht verstanden" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandozeilenoption %s ist nicht Boole'sch" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Option %s erfordert ein Argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Option %s: Konfigurationswertspezifikation muss einen = haben." +msgstr "Option %s: Konfigurationswertspezifikation muss = enthalten." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht „%s“" +msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Option „%s“ ist zu lang" +msgstr "Option »%s« ist zu lang" # Check for boolean; -1 is unspecified, 0 is yes 1 is no -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Der Sinn von „%s“ ist nicht klar, versuchen Sie „true“ oder „false“." +msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false«." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ungültige Operation %s." -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." +msgstr "Kann kein »stat« auf dem Einhängepunkt %s durchführen." -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Kann nicht nach %s wechseln" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Konnte auf CD-ROM nicht zugreifen" +msgstr "Konnte kein »stat« auf der CD-ROM durchführen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Benutze kein Locking für Nur-Lese-Lockdatei %s" +msgstr "Benutze keine Sperre für schreibgeschützte Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Konnte Lockdatei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s" +msgstr "Benutze keine Sperre für NFS-eingebundene Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Auf %s gewartet, aber es war nicht da" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s hat sich unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Konnte Datei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "Lesen, habe noch %lu zu lesen aber nichts mehr da" +msgstr "Lese, habe noch %lu zu lesen, aber nichts mehr übrig" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Beim Unlinking der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Leerer Paketcache" +msgstr "Leerer Paket-Cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Die Paketcachedatei ist korrumpiert" +msgstr "Die Paket-Cache-Datei ist beschädigt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Die Paketcachedatei liegt in einer inkompatiblen Version vor" +msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Dieses APT unterstützt das Versionssystem „%s“ nicht" +msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut" +msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Hängt ab" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Hängt ab (vorher)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Kollidiert" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Veraltet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Stört" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Lese Status-Informationen ein" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Konnte Statusdatei %s nicht öffnen" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Konnte temporäre Statusdatei %s nicht schreiben" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Kann Paketdatei %s nicht parsen (1)" +msgstr "Kann Paketdatei %s nicht verarbeiten (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Kann Paketdatei %s nicht parsen (2)" +msgstr "Kann Paketdatei %s nicht verarbeiten (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI“)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist“)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI parse“)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s („absolute dist“)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist parse“)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quellliste %s („type“)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quellliste %s" +msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Missgestaltete Zeile %u in Quellliste %s („vendor id“)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2421,20 +2496,20 @@ msgstr "" "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " "die Option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Indexdateityp „%s“ wird nicht unterstützt" +msgstr "Indexdateityp »%s« wird nicht unterstützt" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür " +"Das Paket %s muss neu installiert werden, ich kann aber kein Archiv dafür " "finden." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2442,194 +2517,221 @@ msgstr "" "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." +msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene defekte Pakete." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " +"ignoriert oder alte an ihrer Stelle benutzt." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Hole Datei %li von %li (noch %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Hole Datei %li von %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "Methode %s hat nicht korrekt gestartet" +msgstr "Methode %s ist nicht korrekt gestartet" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken " -"Sie die Eingabetaste." +"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« und drücken Sie " +"die Eingabetaste." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Paketierungssystem „%s“ wird nicht unterstützt" +msgstr "Paketierungssystem »%s« wird nicht unterstützt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Kann nicht auf %s zugreifen." +msgstr "Kann kein »stat« auf %s durchführen." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei " +"Sie müssen einige »source«-URIs für Quellen in die sources.list-Datei " "schreiben." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Die Paketliste oder die Statusdatei konnte nicht geparst oder geöffnet " +"Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet " "werden." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren." +msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header" +msgstr "Ungültiger Eintrag in Einstellungsdatei, keine »Package«-Kopfzeilen" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen" +msgstr "Konnte Pinning-Typ (pin type) %s nicht verstehen" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" +msgstr "Cache hat ein inkompatibles Versionssystem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" +msgstr "Ein Fehler trat beim Verarbeiten von %s auf (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann." +"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen APT " +"umgehen kann." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " -"kann." +"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen APT " +"umgehen kann." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen " +"APT umgehen kann." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT " -"handhaben kann." +"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " +"APT umgehen kann." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen." +msgstr "Konnte kein »stat« auf der Liste %s der Quellpakete durchführen." -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Sammle Datei-Empfehlungen ein" +msgstr "Sammle Datei-Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "E/A-Fehler beim Sichern des Quellcaches" +msgstr "E/A-Fehler beim Speichern des Quell-Caches" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5-Summe stimmt nicht" +msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash-Summe stimmt nicht überein" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2638,7 +2740,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2647,173 +2749,222 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." +"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "Größe stimmt nicht" +msgstr "Größe stimmt nicht überein" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Benutze CD-ROM-Einhängpunkt %s\n" +"Benutze CD-ROM-Einhängepunkt %s\n" "Hänge CD-ROM ein\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " -msgstr "Identifiziere... " +msgstr "Identifiziere ... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "Gespeicherte Kennzeichnung: %s \n" +msgid "Stored label: %s\n" +msgstr "Gespeicherte Kennzeichnung: %s\n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Hänge CD-ROM aus ...\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Benutze CD-ROM-Einhängpunkt %s\n" +msgstr "Benutze CD-ROM-Einhängepunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "Warte auf CD...\n" +msgstr "Warte auf Disk ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" -msgstr "Hänge CD-ROM ein...\n" +msgstr "Hänge CD-ROM ein ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Suche auf CD nach Index-Dateien...\n" +msgstr "Suche auf CD nach Index-Dateien ...\n" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Fand %zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " +"Signaturen\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" +msgid "Found label '%s'\n" +msgstr "Fand Kennzeichnung »%s«\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Diese CD heißt: \n" -"„%s“\n" +"Diese Disk heißt: \n" +"»%s«\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "Quelllisteneinträge für diese CD sind:\n" +msgstr "Quelllisteneinträge für diese Disk sind:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Hänge CD-ROM aus..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installiere %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Konfiguriere %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s wird entfernt" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Rufe Nach-Installations-Trigger %s auf" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Verzeichnis »%s« fehlt" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Konfiguriere %s" +msgid "Processing triggers for %s" +msgstr "Verarbeite Auslöser (Trigger) für %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s wird entfernt" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Komplettes Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "%s komplett entfernt" +msgstr "%s vollständig entfernt" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht " +"eingehangen?)\n" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Konnte Datei %s nicht öffnen" +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." diff --git a/po/dz.po b/po/dz.po index de6ccf0..804e943 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -18,146 +18,157 @@ msgstr "" "X-Poedit-Country: Bhutan\n" "X-Poedit-SourceCharset: utf-8\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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ཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "བརླག་སྟོར་ཞུགས་པ:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "རྟེན་འབྲེལ་བསྡོམས:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་ ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(མ་ཐོབ།)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ཅི་མེད།)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "མི་ངོ:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "%4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -180,8 +191,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -306,7 +317,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -315,31 +326,31 @@ msgstr " %sལུ་འབྲི་མ་ཚུགས།" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -423,26 +434,26 @@ msgstr "" " -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" " -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -450,278 +461,278 @@ msgstr "" "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" "པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། " -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "ཨི:" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "ཌབ་ལུ:" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "ཨེབ་བཤོལ་འཕྲུལ་ཆས།" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr "ཡང་ན།" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: cmdline/apt-get.cc:546 +#: 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!" @@ -729,147 +740,147 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།" -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "ནང་འཁོད་ཀྱི་འཛོལ་བ་ གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་" "ཡོད!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་ ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་" "བས།" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sBལེན་ནི་ལུ་དགོཔ་པས། ཡིག་མཛོད་ཚི་གི་%sB་\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་དགོ་པས།\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +891,28 @@ msgstr "" "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "བར་བཤོལ་འབད།" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,49 +920,49 @@ msgstr "" "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" "འབད་བས།\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -962,75 +973,117 @@ msgstr "" "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་ ཡང་ན་\n" "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" -"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" + +#: 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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1038,7 +1091,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1049,135 +1102,122 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" -"ད་ཚུན་ཁྱོད་ཀྱི་བཀོལ་སྤྱོད་རྐྱང་པ་ཅིག་རྐྱང་པ་ རྐྱངམ་ཅིག་ཞུ་བ་འབད་ཡོདཔ་ལས་ ཧ་ཅང་གི་ཐུམ་སྒྲིལ་འདི་གཞི་" -"བཙུགས་འབད་མི་བཏུབ་ནི་དེ་སྲིད་ནི་བཟུམ་ཅིག་དང་ཐུམ་སྒྲིལ་དི་གི་ཁ་ཐད་དུ་རྐྱེན་གྱི་སྙན་ཞུ་འདི་བཀང་བཞག་དགོ" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1186,32 +1226,33 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1226,6 +1267,8 @@ msgid "" " 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" @@ -1241,7 +1284,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1366,26 +1409,30 @@ msgstr "" msgid "Bad default setting!" msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབ།" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིན།་འ་ནི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རྐྱེན་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ནང་ལུ་གྲུབ་འབྲས་འཐོན་འོང་། " "འདི་དེ་བཏུབ་པས་" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1396,188 +1443,188 @@ msgstr "" msgid "Merging available information" msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་ ནང་འཁོད་ཀྱི་འཛོལ་བ།" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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་འདི་ལུ་ལྷག་མ་ཚུགས།" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s་གསར་བསྐྲུན་འབད་མ་ཚུགས།" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "བདག་སྐྱོང་སྣོད་ཐོ་ %sinfo་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "ནང་འཁོད་འཛོལ་བ་གིས་ཐུམ་སྒྲིལ་མིང་ཅིག་ལེན་དོ།" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "ཡིག་ཐོ་བཀོད་འབད་མི་ཚུ་ལྷག་དོ།" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1587,77 +1634,77 @@ msgstr "" "'%sinfo/%s'ཡིག་སྣོད་ཐོག་ཡིག་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། ཁྱོད་ཀྱི་ཡིག་སྣོད་འདི་སོར་ཆུད་འབད་མ་ཚུགས་པ་" "ཅིན་ འདི་སྟོངམ་བཟོ་བཞིནམ་ལས་ དེ་འཕྲལ་ལས་རང་ཐུམ་སྒྲིལ་གི་འཐོན་རིམ་གཅིགཔ་འདི་རང་ལོང་གཞི་བཙུགས་འབད།" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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་ཡིག་སྣོད་ཐོ་བཀོད་འདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "ནང་འཁོད་འཛོལ་བ་གིས་མཐུད་མཚམས་ལེན་དོ།" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་%sdiversionsཚུ་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་འདི་ངན་ཅན་འགྱོ་ནུག" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "ནང་འཁོད་འཛོལ་ ཁ་ཕྱོགས་ཅིག་ཁ་སྐོང་རྐྱབ་དོ།" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "པི་ཀེ་ཇི་ འདྲ་མཛོད་དེ་ དང་པ་རང་འགོ་བྱེད་འབད་དགོ" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "ཐུམ་སྒྲིལ་ཅིག་འཚོལ་་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན:མགོ་ཡིག་ པར་ལེན%lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "གནད་ཚད་ཡིག་སྣོད་དབྱེ་ཚན་ནང་ལུ་ རིམ་སྒྲིག་ཡིག་སྣོད་བྱང་ཉེས། པར་ལེན་ %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ། པར་ལེན་ %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "འ་ནི་འདི་ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ འདི་ལུ་'%s'ཡང་ན་'%s'འཐུས་མི་མིན་འདུག" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "ནང་འཁོད་འཛོལ་བ་ འཐུས་མི་ག་ཡོད་འཚོལ་མ་ཐོབ།" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།" @@ -1678,26 +1725,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "སི་དི་-རོམ་ཕྱི་འགྱུར།" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "%s་ནང་་སི་ཌི་-རོམ་འདི་བརྩེགས་བཤོལ་འབད་མ་ཚུགས་ འདི་ད་ལྟོ་ཡང་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་འོང་ནི་མས།" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: 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 "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1759,7 +1806,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1771,7 +1818,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1825,7 +1872,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1852,59 +1899,59 @@ msgstr "འདྲི་དཔྱད།" msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" @@ -1914,477 +1961,503 @@ msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" msgid "Couldn't access keyring: '%s'" msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་" "འཐོན་དོ།" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་" -"ན།?)" +"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "གྲལ་ཐིག་%d་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག(%d་མཐོ་ཤོས)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/configuration.cc:684 +#: 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:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... འཛོལ་བ་!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... འབད་ཚར་ཡོད།" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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་འདི་ཧ་མ་གོ་བས།" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ = ་ཅིག་དགོཔ་ཨིན།" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "མི་མཐུནམ་ཨིན།" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "ཚབ་བཙུགསཔ་ཨིན།" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "གལ་ཅན།" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "དགོས་མཁོ་ཡོདཔ།" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "ཚད་ལྡན།" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "གདམ་ཁ་ཅན།" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ཐེབས།" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "མི་ངོ་འཐོན་རིམཚུ།" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "བརྟེན་པའི་བཟོ་བཏོན།" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2396,12 +2469,12 @@ msgstr "" "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་" "ལྡན་བཟོ།" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2409,7 +2482,7 @@ msgstr "" "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" "མ་ཐོབ།" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2417,180 +2490,208 @@ msgstr "" "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/acquire.cc:62 +#: 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 "" +"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" +"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:377 +#: 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' དང་ལོག་ལྡེ་འདི་ཨེབ།་" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s (ཐུམ་སྒྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr " %s (འཐོན་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s (ལག་ལེན་ཐུམ་སྒྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s (འཐོན་རིམ་གསརཔ་ ༢)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:753 +#: 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 " @@ -2599,7 +2700,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:812 +#: 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 " @@ -2608,14 +2709,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -2624,7 +2725,7 @@ msgstr "ཚད་མ་མཐུན།" msgid "Vendor block %s contains no fingerprint" msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2633,47 +2734,59 @@ msgstr "" " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "ངོས་འཛིན་འབད་དོ.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་ %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2682,98 +2795,161 @@ msgstr "" "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + #: 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 "" +#~ "ད་ཚུན་ཁྱོད་ཀྱི་བཀོལ་སྤྱོད་རྐྱང་པ་ཅིག་རྐྱང་པ་ རྐྱངམ་ཅིག་ཞུ་བ་འབད་ཡོདཔ་ལས་ ཧ་ཅང་གི་ཐུམ་སྒྲིལ་འདི་གཞི་" +#~ "བཙུགས་འབད་མི་བཏུབ་ནི་དེ་སྲིད་ནི་བཟུམ་ཅིག་དང་ཐུམ་སྒྲིལ་དི་གི་ཁ་ཐད་དུ་རྐྱེན་གྱི་སྙན་ཞུ་འདི་བཀང་བཞག་དགོ" + +#, 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 (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" + +#, 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" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" + #~ msgid "File date has changed %s" #~ msgstr "ཡིག་སྣོད་ཚེས་གྲངས་འདི་གིས་%sདེ་བསྒྱུར་བཅོས་འབད་ནུག" - diff --git a/po/el.po b/po/el.po index 704af6b..46575c2 100644 --- a/po/el.po +++ b/po/el.po @@ -1,174 +1,180 @@ -# translation of apt_po_el_new.po to Greek -# translation of apt_po_el.po to # translation of apt_po_el.po to Greek # translation of apt_po_el.po to -# translation of apt_po_el.po to -# translation of el.po to Greek -# translation of apt.el.po to Hellenic # Greek Translation of APT. # This file is put in the public domain. +# # Fanis Dokianakis , 2003. # Konstantinos Margaritis , 2003, 2004, 2006. # George Papamichelakis , 2004. # George Papamichalakis , 2004. # Greek Translation Team , 2005. # quad-nrg.net , 2005. -# +# Serafeim Zanikolas , 2008. +# quad-nrg.net , 2008. msgid "" msgstr "" -"Project-Id-Version: apt_po_el_new\n" +"Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-01-18 15:16+0200\n" -"Last-Translator: Konstantinos Margaritis \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-08-26 18:25+0300\n" +"Last-Translator: quad-nrg.net \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "org>\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Συνολικά Ονόματα Πακέτων : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Κανονικά Πακέτα: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Πλήρως Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Μονά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Μικτά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "Αγνοούμενα: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Σύνολο Διαφορετικών Εκδόσεων: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Σύνολο Διαφορετικών Εκδόσεων: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Σύνολο Εξαρτήσεων: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Σύνολο Αντιστοιχίσεων Παροχών: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Σύνολο Κοινών Στοιχειοσειρών : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Σύνολο χώρου ασφαλείας: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(δε βρέθηκαν)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(κανένα)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -191,8 +197,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -219,17 +225,18 @@ msgstr "" " add - Προσθέτει ένα αρχείο πακέτου στη cache πηγών\n" " gencaches - Κατασκευή της cache των πακέτων και των πηγών\n" " showpkg - Εμφάνιση μερικών γενικών πληροφοριών για ένα πακέτο\n" -" showsrc - Εμφάνιση των πηγαίων πακέτων\n" +" showsrc - Εμφάνιση εγγραφών για πηγαίο πακέτο\n" " stats - Εμφάνιση μερικών βασικών στατιστικών\n" " dump - Εμφάνιση όλου του αρχείου σε περιληπτική μορφή.\n" -" dumpavail - Εκτύπωση της λίστας των διαθέσιμων πακέτων στην έξοδο stdout\n" +" dumpavail - Εκτύπωση της λίστας των διαθέσιμων πακέτων στην κανονική " +"έξοδο\n" " unmet - Εμφάνιση μη ικανοποιούμενων εξαρτήσεων\n" " search - Αναζήτηση στη λίστα πακέτων για αυτή τη κανονική παράσταση\n" " show - Εμφάνιση μιας αναγνώσιμης εγγραφής για το πακέτο\n" -" depends - Εμφάνιση μη επεξεργασμένων εξαρτήσεων ενός πακέτου\n" +" depends - Εμφάνιση των εξαρτήσεων ενός πακέτου\n" " rdepends - Εμφάνιση αντίστροφων εξαρτήσεων ενός πακέτου\n" " pkgnames - Εμφάνιση λίστας με τα ονόματα όλων των πακέτων\n" -" dotty - Παραγωγή γραφημάτων πακέτων για το GraphVis\n" +" dotty - Παραγωγή γραφημάτων πακέτων για το GraphViz\n" " xvcg - Παραγωγή γραφημάτων πακέτων για το xvcg\n" " policy - Εμφάνιση προτεραιοτήτων πηγών\n" "\n" @@ -318,7 +325,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -327,31 +334,31 @@ msgstr "Αδύνατη η εγγραφή στο %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Σφάλμα επεξεργασίας του καταλόγου %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -435,303 +442,305 @@ msgstr "" " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" -#: ftparchive/cachedb.cc:76 +#: 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 σε νεότερη " +"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Σφάλματα στο αρχείο" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Αδύνατη η εύρεση του %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Αποτυχία ανεύρεσης" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία ανοίγματος του %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "Αποσύνδεση %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία ανάγνωσης του %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύνδεσης του %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύνδεσης του %s με το %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:623 -#, fuzzy, c-format +#: ftparchive/writer.cc:620 +#, c-format msgid " %s has no source override entry\n" -msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" +msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format +#: ftparchive/writer.cc:624 +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" +msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Αδύνατο το άνοιγμα του %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Αποτυχία αγκίστρωσης" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Συμπίεση απογόνου" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "αποσυμπιεστής" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " η" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -739,148 +748,149 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Ετοιμο" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Αδύνατη η ανάγνωση της λίστας πηγών." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Μετά από αυτή τη λειτουργία, θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -891,28 +901,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -920,49 +930,49 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -974,77 +984,120 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Η έκδοση %s για το%s δεν βρέθηκε" +msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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." + +#. +#. 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 "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" +msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "το %s έχει εγκατασταθεί με το χέρι\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" +msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1052,7 +1105,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1064,134 +1117,120 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1569 -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" -"αναφορά σφάλματος για αυτό το πακέτο." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2147 +#, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1199,7 +1238,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1208,32 +1247,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1248,6 +1287,8 @@ msgid "" " 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" @@ -1263,7 +1304,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1297,10 +1338,10 @@ msgstr "" "\n" "Παράμετροι:\n" " -h Αυτό το βοηθητικό κείμενο.\n" -" -q Loggable output - no progress indicator\n" +" -q Χωρίς αναλυτική ένδειξη προόδου (κατάλληλο για αποθήκευση της εξόδου)\n" " -qq Χωρίς λεπτομέρειες εκτός από τα λάθη\n" " -d Μεταφόρτωση μόνο - ΜΗΝ αποσυμπιέσεις ή εγκαταστήσεις αρχεία\n" -" -s Χωρίς ενέργεια. Perform ordering simulation\n" +" -s Χωρίς ενέργεια. Διενέργεια προσομοίωσης βημάτων εγκατάστασης\n" " -y Υπόθεσε Ναι για όλες τις ερωτήσεις και μην περιμένεις απάντηση\n" " -f Προσπάθησε να συνεχίσεις αν αποτύχει ο έλεγχος ακεραιότητας\n" " -m Προσπάθησε να συνεχίσεις αν υπάρχουν άγνωστα πακέτα\n" @@ -1383,26 +1424,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Κακή προκαθορισμένη ρύθμιση!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: 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 για συνέχεια." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Επιθυμείτε τη διαγραφή ήδη μεταφορτωμένων αρχείων .deb;" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Προέκυψανσφάλματα κατά την αποσυμπίεση. Θα ρυθμίσω τα " -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "πακέτα που εγκαταστάθηκαν. Αυτό μπορεί να παράγει διπλά λάθη" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ή σφάλματα που προκύπτουν από χαλασμένες εξαρτήσεις. Αυτό είναι εντάξει, " "μόνο τα λάθη" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1413,188 +1458,188 @@ msgstr "" msgid "Merging available information" msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Μη έγκυρη υπογραφή αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Η αρχειοθήκη είναι πολύ μικρή" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Αποτυχία εντοπισμού του στοιχείου hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Αδυναμία εντοπισμού εκτροπής" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Εσωτερικό Σφάλμα στο AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Διπλή προσθήκη εκτροπής %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Αποσυμπίεση του %s πάνω από μια φορά" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Ο φάκελος %s έχει εκτραπεί" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Η διαδρομή έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Αποτυχία διαγραφής του %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Αδύνατη η δημιουργία του %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Αποτυχία εύρεσης της κατάστασης του %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Ανάγνωση Λιστών Πακέτων" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο διαχείρισης %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Ανάγνωση Λίστας Πακέτων" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1605,77 +1650,78 @@ msgstr "" "επαναφέρετε το αρχείο, τότε αδειάστε το και άμεσα εγκαταστήστε ξανά την ίδια " "έκδοση του πακέτου!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Εσωτερικό Σφάλμα στη λήψη ενός Κόμβου" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Αποτυχία στο άνοιγμα του αρχείου παρακάμψεων %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Το αρχείο παρακάμψεων είναι κατεστραμμένο" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Αποτυχία εύρεσης μιας κεφαλίδας Package:, γραμμή %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κατάστασης. Γραμμή %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Μη έγκυρο αρχείο DEB, δεν περιέχει το μέλος %s' or '%s' " +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Αυτό δεν είναι ένα έγκυρο αρχείο DEB, δεν περιέχει το μέλος '%s', '%s' ή '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Αδύνατη η αλλαγή σε %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Μη αναλύσιμο αρχείο control" @@ -1696,26 +1742,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Λάθος CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1777,7 +1822,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1789,7 +1834,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1843,7 +1888,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1870,97 +1915,99 @@ msgstr "Επερώτηση" msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Σύνδεση στο %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Αδύνατη η εύρεση του '%s'" +msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:213 -#, fuzzy, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)" +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" +"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι " +"εγκατεστημένο το gpgv;)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1978,433 +2025,459 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Αποτυχία εγγραφής του αρχείου %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχείου" +msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: Συμπεριλαμβάνεται από εδώ" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Σφάλμα!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 δεν είναι κατανοητή" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Η επιλογή %s απαιτεί ένα όρισμα." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Άδειο cache πακέτων" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Εξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ΠροΕξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Προτείνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Συστήνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ασύμβατο με" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Αντικαθιστά" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Απαρχαιώνει" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Χαλάει" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "σημαντικό" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "απαιτούμενο" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "καθιερωμένο" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "προαιρετικό" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "επιπλέον" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2416,12 +2489,12 @@ msgstr "" "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " "επιλογή APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2429,7 +2502,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2437,188 +2510,214 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " +"στη θέση τους." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:828 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Ανάγνωση Λίστας Πακέτων" +msgstr "Λήψη αρχείου %li του %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:377 +#: 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." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Αδύνατη η εύρεση της κατάστασης του %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Ανόμοιο MD5Sum" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "" +msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2627,7 +2726,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2636,7 +2735,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2644,7 +2743,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2653,7 +2752,7 @@ msgstr "Ανόμοιο μέγεθος" msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2662,47 +2761,60 @@ msgstr "" "Χρησιμοποιείται το σημείο προσάρτησης %s\n" "Προσαρτάται το CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Αναγνώριση..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Αποπροσάρτηση του CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:647 +#: 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" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n" +msgid "Found label '%s'\n" +msgstr "Εύρεση ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2711,112 +2823,128 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Αποπροσάρτηση του CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Εγκατάσταση του %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Ρύθμιση του %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Αφαιρώ το %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Εκτέλεση του post-installation trigger %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Ο φάκελος %s αγνοείται." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Ρύθμιση του %s" +msgid "Processing triggers for %s" +msgstr "Επεξεργασία triggers για το %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "Εγκατέστησα το %s" +msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Αφαιρώ το %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format msgid "Preparing to completely remove %s" -msgstr "Προετοιμασία ρύθμισης του %s" +msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#: 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 "" +"Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι " +"προσαρτημένο το /dev/pts;)\n" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +msgstr "Αδύνατη η διόρθωση του αρχείου" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" -#~ msgid "File date has changed %s" -#~ msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει" - -#~ msgid "Reading file list" -#~ msgstr "Ανάγνωση Λιστών Αρχείων" - -#~ msgid "Could not execute " -#~ msgstr "Αδύνατη η εκτέλεση " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "Προετοιμασία για αφαίρεση με ρύθμιση του %s" - -#~ msgid "Removed with config %s" -#~ msgstr "Αφαίρεσα με ρύθμιση το %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" +#~ "that package should be filed." +#~ msgstr "" +#~ "Εφόσον ζητήσατε μια και μόνη λειτουργία, είναι πολύ πιθανόν ότι\n" +#~ "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" +#~ "αναφορά σφάλματος για αυτό το πακέτο." diff --git a/po/en_GB.po b/po/en_GB.po index dd572b6..969b90c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,159 +1,167 @@ # English messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # Michael Piefel , 2002. -# -# +# +# msgid "" msgstr "" -"Project-Id-Version: apt 0.6.46.2\n" +"Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-12 11:07+0100\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 11:47+0000\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Package %s version %s has an unmet dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Unable to locate package %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Total package names: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Total distinct descriptions: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Total Desc/File relations: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache is out of sync, can't x-ref a package file" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s for %s %s compiled on %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s for %s compiled on %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -212,8 +220,8 @@ msgstr "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -300,7 +308,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -309,31 +317,31 @@ msgstr "Unable to write to %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Cannot get debconf version. Is debconf installed?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Package extension list is too long" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 processing directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Source extension list is too long" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error writing header to contents file" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error processing contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,26 +421,26 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "No selections matched" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -440,278 +448,278 @@ msgstr "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Failed to stat %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internal error, could not locate member %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Failed to allocate memory" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Unable to open %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Malformed override %s line %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Malformed override %s line %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Malformed override %s line %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Failed to read the override file %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unknown compression algorithm ‘%s’" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Compressed output %s needs a compression set" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Failed to create IPC pipe to subprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Failed to create FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Failed to fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Compress child" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Internal error, failed to create %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Failed to create subprocess IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Failed to exec compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "IO to subprocess/file failed" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Failed to read while computing MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problem unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Failed to rename %s to %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "The following packages have unmet dependencies." -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "but %s is installed" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "but it is not installable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "but it is a virtual package" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "but it is not installed" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "but it is not going to be installed" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " or" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -719,143 +727,143 @@ msgstr "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimise the upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "The list of sources could not be read." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "After this operation, %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "After this operation, %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -866,28 +874,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +903,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Note, selecting %s for regex ‘%s’\n" +msgstr "Note, selecting %s instead of %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,83 +954,127 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "We are not supposed to delete stuff, cannot start AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Use 'apt-get autoremove' to remove them." + +#: 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, seems like the AutoRemoved destroyed something which really\n" +"shouldn't happen. Please file a bug report against 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 "The following information may help to resolve the situation:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internal Error, AutoRemoved broke stuff" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Couldn't find task %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s set to manually installed.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "You might want to run ‘apt-get -f install’ to correct these:" +msgstr "You might want to run 'apt-get -f install' to correct these:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1034,129 +1086,116 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1569 -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 "" -"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." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "The following information may help to resolve the situation:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" -msgstr "Must specify at least one package to check builddeps for" +msgstr "" +"Must specify at least one package for which you want to check builddeps" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1165,7 +1204,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,31 +1213,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1213,6 +1252,8 @@ msgid "" " 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" @@ -1228,7 +1269,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1252,6 +1293,8 @@ msgstr "" " 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" @@ -1312,7 +1355,7 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" "Media Change: Please insert the disc labelled\n" -" ‘%s’\n" +" '%s'\n" "in the drive ‘%s’ and press enter\n" #: cmdline/apt-sortpkgs.cc:86 @@ -1347,24 +1390,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Bad default setting!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Press enter to continue." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Do you want to erase any previously downloaded .deb files?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Some errors occurred while unpacking. I'm going to configure the" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "packages that were installed. This may result in duplicate errors" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "or errors caused by missing dependencies. This is OK, only the errors" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1374,269 +1421,269 @@ msgstr "" msgid "Merging available information" msgstr "Merging available information" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Invalid archive signature" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error reading archive member header" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Invalid archive member header" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archive is too short" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Failed to read the archive headers" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode called on still linked node" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Failed to locate the hash element!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Failed to allocate diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Double add of diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicate conf file %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Failed to write file ‘%s’" +msgstr "Failed to write file %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Failed to close file %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "The path %s is too long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Unpacking %s more than once" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "The directory %s is diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "The package is trying to write to the diversion target %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "The diversion path is too long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "The directory %s is being replaced by a non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Failed to locate node in its hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "The path is too long" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overwrite package match with no version for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overwrites the one in the package %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Unable to read %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Unable to stat %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Failed to remove %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Unable to create %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Failed to stat %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Reading package lists" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Failed to change to the admin dir %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Internal error getting a package name" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Reading file listing" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Failed to open the list file ‘%sinfo/%s’. If you cannot restore this file " +"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!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Failed reading the list file %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internal error getting a node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Failed to open the diversions file %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "The diversion file is corrupted" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Invalid line in the diversion file: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internal error adding a diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "The pkg cache must be initialised first" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Failed to find a Package: header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Bad ConfFile section in the status file. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error parsing MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "This is not a valid DEB archive, missing ‘%s’ member" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Couldn't change to %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Internal error, could not locate member" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Failed to locate a valid control file" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Unparsable control file" @@ -1657,26 +1704,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Wrong CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Unable to unmount the CD-ROM in %s, it may still be in use." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk not found." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File not found" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Failed to stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1738,7 +1784,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1750,13 +1796,13 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "could not create a socket" +msgstr "Could not create a socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" @@ -1804,7 +1850,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1831,59 +1877,59 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Unable to invoke" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Connecting to %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Could not create a socket for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Cannot initiate the connection to %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Could not connect to %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Unable to connect to %s %s:" @@ -1893,34 +1939,34 @@ msgstr "Unable to connect to %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Couldn't access keyring: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "Could not execute '%s' to verify signature (is gpgv installed?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1938,427 +1984,452 @@ msgstr "Couldn't open pipe for %s" msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Failed to truncate file" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Internal error" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Line %d too long (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Done" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Command line option ‘%c’ [from %s] is not known." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Command line option %s is not understood" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Command line option %s is not boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Option %s requires an argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Option %s: Configuration item specification must have an =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Option %s requires an integer argument, not ‘%s’" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Option ‘%s’ is too long" +msgstr "Option '%s' is too long" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sense %s is not understood, try true or false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Invalid operation %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Unable to stat the mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Unable to change to %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "This APT does not support the Versioning System ‘%s’" +msgstr "This APT does not support the versioning system ‘%s’" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Breaks" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Reading state information" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Failed to open StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Failed to write temporary StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2369,19 +2440,19 @@ msgstr "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "The package %s needs to be reinstalled, but I can't find an archive for it." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2389,182 +2460,206 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lists directory %spartial is missing." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archive directory %spartial is missing." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Retrieving file %li of %li (%s remaining)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Retrieving file %li of %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "The method driver %s could not be found." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Unable to stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "You must put some ‘source’ URIs in your sources.list" +msgstr "You must put some 'source' URIs in your sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "The package lists or status file could not be parsed or opened." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Error occurred while processing %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Error occurred while processing %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wow, you exceeded the number of package names this APT can handle.." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, you exceeded the number of versions this APT can handle." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, you exceeded the number of descriptions this APT can handle." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, you exceeded the number of dependencies this APT can handle." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash Sum mismatch" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2573,7 +2668,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2582,14 +2677,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Size mismatch" @@ -2598,7 +2693,7 @@ msgstr "Size mismatch" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2607,47 +2702,60 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "Stored label: %s \n" +msgid "Stored label: %s\n" +msgstr "Stored label: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Unmounting CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Found %zu package indices, %zu source indices, %zu translation indices and %" +"zu signatures\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" +msgstr "Found label: %s\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2656,92 +2764,113 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Unmounting CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Wrote %i records.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Wrote %i records with %i missing files.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Wrote %i records with %i mismatched files\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Wrote %i records with %i missing files and %i mismatched files\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installing %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Configuring %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Removing %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Running post-installation trigger %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Directory '%s' missing." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Configuring %s" +msgid "Processing triggers for %s" +msgstr "Processing triggers for %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Removing %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Could not patch file" @@ -2749,3 +2878,6 @@ msgstr "Could not patch file" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Dynamic MMap ran out of room" diff --git a/po/es.po b/po/es.po index 94f296b..3c5fae4 100644 --- a/po/es.po +++ b/po/es.po @@ -2,163 +2,170 @@ # Copyright (C) 2002 Free Software Foundation, Inc. # Rafael Sepulveda , 2002. # Asier Llano Palacios -# Javier Fernandez-Sanguino Pena 2003 # Ruben Porras Campo 2004 -# Javier Fernandez-Sanguino 2006 -# +# Javier Fernandez-Sanguino 2003, 2006-2008 +# msgid "" msgstr "" -"Project-Id-Version: apt 0.6.42.3exp1\n" +"Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-08 00:23+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-15 21:52+0100\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Nombres de paquetes totales: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquetes normales: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquetes virtuales puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquetes virtuales únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquetes virtuales mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltan: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Versiones diferentes totales: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Descipciones diferentes totales: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Dependencias totales: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Relaciones versión/archivo totales: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Relaciones descripción/archivo totales: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Mapeo Total de Provisiones: " -# globbed -> globalizadas ? (jfs) -#: cmdline/apt-cache.cc:297 +# globbed -> globalizadas ? (jfs) +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Cadenas globalizadas totales: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Espacio de versión de dependencias total: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Espacio desperdiciado total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Espacio registrado total: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s está desincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Debe dar exactamente un patrón" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No se encontró ningún paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(no encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ninguno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s para %s %s compilado en %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s para %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -181,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -199,6 +206,7 @@ msgstr "" "Uso: apt-cache [opciones] orden\n" " apt-cache [opciones] add archivo1 [archivo2 ...]\n" " apt-cache [opciones] showpkg paq1 [paq2 ...]\n" +" apt-cache [opciones] showsrc paq1 [paq2 ...]\n" "\n" "apt-cache es una herramienta de bajo nivel que se utiliza para manipular\n" "los archivos binarios de caché de APT y consultar información sobre éstos\n" @@ -218,8 +226,8 @@ msgstr "" " depends - Muestra la información de dependencias en bruto para el " "paquete\n" " rdepends - Muestra la información de dependencias inversas del paquete\n" -" pkgnames - Lista los nombres de todos los paquetes\n" -" dotty - Genera gráficas del paquete para GraphVis\n" +" pkgnames - Lista los nombres de todos los paquetes en el sistema\n" +" dotty - Genera gráficas del paquete para GraphViz\n" " xvcg - Genera gráficas del paquete para xvcg\n" " policy - Muestra parámetros de las normas\n" "\n" @@ -310,7 +318,7 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -319,31 +327,31 @@ msgstr "No se puede escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La lista de extensión de paquetes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 procesando el directorio %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La lista de extensión de fuentes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -428,26 +436,26 @@ msgstr "" " -c=? Lee este archivo de configuración\n" " -o=? Establece una opción de configuración arbitraria" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ninguna selección coincide" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD corrompida, archivo renombrado a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -455,278 +463,278 @@ msgstr "" "El formato de la base de datos no es válido. Debe eliminar y recrear la base " "de datos si ha actualizado de una versión anterior de apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "No pude leer %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo '" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Falló el recorrido por el árbol." -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al límite de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Error interno, no pude localizar el miembro %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Predominio mal formado %s línea %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Predominio mal formado %s línea %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No se pudo leer el archivo de predominio %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo desconocido de compresión '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Salida comprimida %s necesita una herramienta de compresión" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "No se pudo crear FICHERO*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "No se pudo bifurcar" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Hijo compresión" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Hay problemas desligando %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "pero no es instalable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "pero no está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -734,146 +742,146 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " falló." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualización" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticación ignorado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estos paquetes sin verificación [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utilizó -y sin --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó el ordenamiento" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 se pudieron leer las listas de fuentes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro.. Los tamaños no concuerdan, mande un correo a \n" "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n" +"Se utilizarán %sB de espacio de disco adicional después de esta operación.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Se liberarán %sB después de desempaquetar.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Se liberarán %sB después de esta operación.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especificó Trivial Only pero ésta no es una operación trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Sí, ¡haga lo que le digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +892,28 @@ msgstr "" "Para continuar escriba la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,47 +921,47 @@ msgstr "" "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no están soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Abortando la instalación." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminará\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explícitamente uno para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,75 +972,120 @@ msgstr "" "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalación" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya está en su versión más reciente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontró la Distribución '%s' para '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontró la versión '%s' para '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versión seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Algunos archivos de índice no se han podido descargar, se han ignorado,\n" -"o se ha utilizado unos antiguos en su lugar." +"Se instalaron de forma automática los siguientes paquetes y ya no son " +"necesarios." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Utilice «apt-get autoremove» para eliminarlos." + +#: 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 "" +"Hmmm. Parece que «AutoRemover» destruyó algo y eso no debería haber pasado. " +"Por favor, envíe un informe de fallo al programa 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 información puede ayudar a resolver la situación:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Error interno, «AutoRemover» rompió cosas" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "No se pudo encontrar la tarea %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresión regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "fijado %s como instalado manualmente.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1040,7 +1093,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1052,133 +1105,119 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1569 -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 "" -"Como sólo solicito una única operación, es extremadamente posible que el\n" -"paquete simplemente no sea instalable y debería de rellenar un informe de\n" -"error contra ese paquete." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "La siguiente información puede ayudar a resolver la situación:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió\n" "algunas cosas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su código fuente" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construcción" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener información de dependencias de construcción para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1187,7 +1226,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1196,32 +1235,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n" "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construcción de %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1236,6 +1275,8 @@ msgid "" " 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" @@ -1251,7 +1292,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1274,6 +1315,7 @@ msgstr "" " upgrade - Realiza una actualización\n" " install - Instala nuevos paquetes (paquete es libc6 y no libc6.deb)\n" " remove - Elimina paquetes\n" +" purge - Elimina y purga paquetes\n" " source - Descarga archivos fuente\n" " build-dep - Configura las dependencias de construcción para paquetes " "fuente\n" @@ -1373,28 +1415,32 @@ msgstr "" msgid "Bad default setting!" msgstr "¡Parámetro por omisión incorrecto!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Presione Intro para continuar." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "¿Desea borrar los archivos .deb descargados con anterioridad?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Ocurrieron algunos errores mientras se desempaquetaba. Se va a configurar el" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "paquetes que fueron instalados. Esto puede dar lugar a errores duplicados" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "o errores causados por dependencias no presentes. Esto está BIEN, sólo los\n" "errores" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1405,189 +1451,189 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "No pude crear las tuberías" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "No se aprobó la suma de control del tar, archive corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Firma del archivo inválida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error leyendo la cabecera de miembro del archivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabecera de miembro del archivo inválida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "El archivo es muy pequeño" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "No pude leer las cabeceras del archivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode llamado en un nodo todavía ligado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "¡No pude localizar el elemento enlazado!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No pude asignar una desviación" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Error interno en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tratando de sobreescribir una desviación, %s -> %s y %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doble suma de desviación %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: 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 del archivo %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "La trayectoria %s es demasiado larga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s más de una vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "El directorio %s está desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete está tratando de escribir al blanco desviado %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "La trayectoria de desviación es demasiado larga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directorio %s está siendo reemplazado por un no-directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "No pude localizar el nodo en su bote de enlace" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "La trayectoria es muy larga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete sin versión para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "No pude leer %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No pude leer %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "No pude borrar %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "No pude crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "No pude leer %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Leyendo lista de paquetes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "No pude cambiarme al directorio de administración %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Error interno obteniendo un Nombre de Paquete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Leyendo Listado de Archivos" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1598,77 +1644,77 @@ msgstr "" "archivo entonces cree uno vacío e inmediatamente reinstale la misma versión " "del paquete!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "No pude leer el archivo de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Error interno obteniendo un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "No pude abrir el archivo de desviación %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "El archive de desviación esta corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 inválida en el archivo de desviación: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Error interno agregando una desviación" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "El caché del paquete debe de inicializarse primero" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "No pude encontrar un paquete: Cabecera, desplazo %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Mala sección del ConfFile en el archivo de estado. Desplazo %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error leyendo Md5. Desplazo %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Este no es un archivo DEB válido, falta el miembro '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Este no es un archivo DEB válido, falta el miembro '%s' o '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Este no es un archivo DEB válido, falta el miembro '%s', '%s' o '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "No pude cambiar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Error interno, no pude localizar el miembro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "No pude localizar un archivo de control válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Archivo de control inanalizable" @@ -1689,26 +1735,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD equivocado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "No pude leer" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -1770,7 +1815,7 @@ msgstr "La conexi msgid "Server closed the connection" msgstr "El servidor cerró la conexión" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1782,7 +1827,7 @@ msgstr "Una respuesta desbord msgid "Protocol corruption" msgstr "Corrupción del protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -1836,7 +1881,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1863,59 +1908,59 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No pude invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No puedo iniciar la conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No pude conectarme a %s:%s (%s), expiró tiempo para conexión" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "No pude resolver '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo raro pasó resolviendo '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" @@ -1925,36 +1970,36 @@ msgstr "No pude conectarme a %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "No se pudo acceder al anillo de claves: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Se encontró al menos una firma inválida." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"No se pudo ejecutar '%s' para verificar la firma (¿está instalado gnupg?)" +"No se pudo ejecutar '%s' para verificar la firma (¿está instalado gpgv?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron inválidas:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1972,431 +2017,456 @@ msgstr "No pude abrir una tuber msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Mala línea de cabecera" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envió una cabecera de respuesta inválida" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envió una cabecera de Content-Length inválida" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envió una cabecera de Content-Range inválida" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Éste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Falló al truncar el archivo" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Error interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vacío" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Selección %s no encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviación no reconocida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuración %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Línea %d demasiado larga (máx %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra después del valor" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: Las directivas sólo se pueden poner\n" "en el primer nivel" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aquí" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hecho" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "No se conoce la opción de línea de órdenes '%c' [ de %s]" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "No se entiende la opción de línea de órdenes %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "La opción de línea de órdenes %s no es un booleano" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "La opción %s necesita un argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opción %s: La especificación del elemento de configuración debe tener un " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "La opción %s exige un argumento entero, no '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opción '%s' demasiado larga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentido %s no se entiende, pruebe verdadero o falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operación inválida: %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "No se puede obtener información del punto de montaje %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "No se pudo cambiar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba allí" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibió un fallo de segmentación." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvió un código de error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s terminó de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "leídos, todavía debía leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Caché de paquetes vacía." -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El archivo de caché de paquetes esta corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El archivo de caché de paquetes es una versión incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT no soporta el sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La caché de paquetes se había creado para una arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugiere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Hace obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Rompe" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requiere" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Generación de dependencias" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Leyendo la información de estado" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "No se pudo abrir el fichero de estado %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falló la escritura del fichero de estado temporal %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Línea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' desconocido en la línea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2408,12 +2478,12 @@ msgstr "" "Esto generalmente es malo, pero si realmente quiere hacerlo, active \n" "la opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de índice '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2421,7 +2491,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "éste." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2429,193 +2499,218 @@ msgstr "" "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" "rotos." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Algunos archivos de índice no se han podido descargar, se han ignorado,\n" +"o se ha utilizado unos antiguos en su lugar." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Descargando fichero %li de %li (falta %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Descargando fichero %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "No se pudo encontrar el método %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "El método %s no se inició correctamente" -#: apt-pkg/acquire-worker.cc:377 +#: 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, inserte el disco «%s» en la unidad «%s» y presione Intro" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no está soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "No se pudo leer %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe poner algunos URIs 'fuente' en su sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No se pudieron analizar o abrir las listas de paquetes o el archivo de " "estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Registro inválido en el archivo de preferencias, no hay cabecera de paquete" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La caché tiene una versión incompatible de sistema de versiones" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedió el número de nombres de paquetes que este APT es capaz de " "manejar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Vaya, excedió el número de descripciones que este APT es capaz de manejar." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedió el número de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurrió un error mientras procesaba %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontró el\n" "paquete %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Error de E/S guardando caché fuente" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "La suma hash difiere" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2625,7 +2720,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2634,7 +2729,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2642,7 +2737,7 @@ msgstr "" "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "El tamaño difiere" @@ -2651,7 +2746,7 @@ msgstr "El tama msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2660,47 +2755,60 @@ msgstr "" "Usando el punto de montaje del CD-ROM %s\n" "Montando el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando el CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de índices...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices " +"de traducción y %zu firmas\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Se encontraron %i índices de paquetes, %i de fuentes y %i firmas\n" +msgid "Found label '%s'\n" +msgstr "Se encontró la etiqueta: '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2709,93 +2817,116 @@ msgstr "" "Este disco se llama: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Desmontando CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: 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 "Eliminando %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Ejecutando disparador post-instalación %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Falta el directorio '%s'." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Preparándose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Processing triggers for %s" +msgstr "Procesando disparadores para %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Preparándose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Eliminando %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparándose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Se borró completamente %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"No se pudo escbribir en el registro, falló la llamada a «openpty()» (¿está " +"montado /dev/pts?)\n" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "No pude parchear el fichero" @@ -2804,6 +2935,44 @@ msgstr "No pude parchear el fichero" msgid "Connection closed prematurely" msgstr "La conexión se cerró prematuramente" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "La función «Dynamic MMap» se quedó sin espacio" + +#~ 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 "" +#~ "Como sólo solicito una única operación, es extremadamente posible que el\n" +#~ "paquete simplemente no sea instalable y debería de rellenar un informe " +#~ "de\n" +#~ "error contra ese paquete." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Línea %d demasiado larga (máx %lu)" + +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Línea %d demasiado larga (máx %d)" + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc1)" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Ocurrió un error mientras se procesaba %s (NewFileDesc2)" + +#~ msgid "Stored label: %s \n" +#~ msgstr "Etiqueta guardada: %s \n" + +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Se encontraron %i índices de paquetes, %i índices de fuentes, %i índices " +#~ "de traducción y %i firmas\n" + +#~ msgid "openpty failed\n" +#~ msgstr "Falló openpty\n" + #~ msgid "File date has changed %s" #~ msgstr "Cambió la fecha del archivo %s" diff --git a/po/eu.po b/po/eu.po index 568305d..57decfa 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,164 +1,171 @@ -# translation of apt_po_eu.po to librezale +# translation of apt_po_eu.po to Euskara # This file is put in the public domain. # # Hizkuntza Politikarako Sailburuordetza , 2005. -# Piarres Beobide , 2005, 2006. +# Piarres Beobide , 2005, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-27 13:59+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-18 10:32+0100\n" "Last-Translator: Piarres Beobide \n" -"Language-Team: librezale \n" +"Language-Team: Euskara \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" -"\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n" +msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Pakete Izenak Guztira : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pakete normalak:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pakete birtual puruak:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Bakanako pakete birtualak: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Nahastutako pakete birtualak: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Falta direnak: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Bertsio Ezberdinak Guztira: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Azalpen Ezberdinak Guztira: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Dependentziak Guztira: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Guztira Bertsio/fitxategi erlazioak: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Fitx/Azalpen erlazioak guztira: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Guztira Saltzaile Mapatzea: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Guztira beteratutakokateak: " +msgstr "Guztira bateratutako kateak: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Guztira bertsio dependentzi lekua: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Guztira galdutako tokia:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Guztira erregitratutako lekua: " +msgstr "Guztira erregistratutako lekua: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "%s pakete-fitxategia ez dago sinkronizatuta." +msgstr "%s pakete fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "Pakete Fitxatefiak:" +msgstr "Pakete Fitxategiak:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " -"pakete-fitxategi bati" +"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " +"pakete fitxategi bati" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ez da aurkitu)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(bat ere ez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" -msgstr " Bertsio tabla:" +msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s (%s %s) konpilatua: %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -181,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -201,34 +208,34 @@ msgstr "" " apt-cache [aukerak] showpkg pak1 [pak2 ...]\n" " apt-cache [aukerak] showsrc pak1 [pak2 ...]\n" "\n" -"APTren cache-fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n" +"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n" "den behe-mailako tresna bat da, apt-cache.\n" +"\n" "Komandoak:\n" -" add - Pakete-fitxategi bat gehitzen du iturburuko cachean\n" -" gencaches - Bi cacheak sortzen ditu: paketeena eta iturburuena\n" +" add - Pakete fitxategi bat gehitzen du iturburuko katxean\n" +" gencaches - Bi katxeak sortzen ditu: paketeena eta iturburuena\n" " showpkg - Pakete baten informazio orokorra erakusten du\n" -" showsrc - Iturburu-erregistroak erakusten ditu\n" +" showsrc - Iturburu erregistroak erakusten ditu\n" " stats - Oinarrizko estatistika batzuk erakusten ditu\n" " dump - Fitxategi osoa erakusten du formatu laburrean\n" " dumpavail - Fitxategi erabilgarri bat irteera estandarrean inprimatu\n" " unmet - Bete gabeko mendekotasunak erakusten ditu\n" -" search - Adierazpen erregularrak bilatzen ditu pakete-zerrendan \n" +" search - Adierazpen erregularrak bilatzen ditu pakete zerrendan \n" " show - Paketearen erregistro irakurgarri bat erakusten du\n" " depends - Pakete baten mendekotasunak erakusten ditu\n" -" rdepends - Pakete baten mendekotasun alderantzikatuak erakusten ditu\n" " pkgnames - Pakete guztien izenak zerrendatzen ditu\n" -" dotty - GraphVis-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" -" xvcg - xvcg-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" +" dotty - GraphViz-ekin erabiltzeko pakete grafikoak sortzen ditu\n" +" xvcg - xvcg-ekin erabiltzeko pakete grafikoak sortzen ditu\n" " policy - Gidalerroen ezarpenak erakusten ditu\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -p=? Paketearen cachea.\n" -" -s=? Iturburuaren cachea.\n" -" -q Desgaitu progresio-adierazlea.\n" +" -h Laguntza testu hau.\n" +" -p=? Paketearen katxea.\n" +" -s=? Iturburuaren katxea.\n" +" -q Desgaitu progresio adierazlea.\n" " -i Mendekotasun nagusiak soilik erakutsi.\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" "Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" #: cmdline/apt-cdrom.cc:78 @@ -238,7 +245,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Mesedez sa diska bat gailuan eta enter sakatu" +msgstr "Mesedez sar diska bat gailuan eta enter sakatu" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -265,16 +272,16 @@ msgid "" msgstr "" "Erabilera: apt-config [aukerak] komandoa\n" "\n" -"apt-config APT konfigurazio-fitxategia irakurtzeko tresna soil bat da\n" +"apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n" "\n" "Komandoak:\n" " shell - Shell modua\n" " dump - Konfigurazioa erakusten du\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -h Laguntza testu hau.\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -300,12 +307,12 @@ msgstr "" "informazioa ateratzeko tresna bat da\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" +" -h Laguntza testu hau\n" " -t Ezarri aldi baterako direktorioa\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -314,31 +321,31 @@ msgstr "%s : ezin da idatzi" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "Pakete-luzapenen zerrenda luzeegia da" +msgstr "Pakete luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Errorea direktorioa prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "Iturburu-luzapenen zerrenda luzeegia da" +msgstr "Iturburu luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Errorea eduki-fitxategiaren goiburua idaztean" +msgstr "Errorea eduki fitxategiaren goiburua idaztean" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -391,52 +398,52 @@ msgstr "" "estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n" "'dpkg-scanpackages' eta 'dpkg-scansources'erako\n" "Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n" -"Package fitxategiak pakete bakoitzaren kontrol-eremu guztiak izaten ditu,\n" -"MD5 hash balioa eta fitxategi-tamaina barne. Override fitxategia erabiltzen\n" -"da lehentasunearen eta sekzioaren balioak behartzeko.\n" +"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n" +"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n" +"da lehentasunaren eta sekzioaren balioak behartzeko.\n" "\n" -"Era berean, iturburu-fitxategiak ere sortzen ditu .dsc fitxategien\n" +"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n" "zuhaitzetik. --source-override aukera erabil daiteke src override \n" "fitxategi bat zehazteko.\n" "'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n" "BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n" "override fitxategiak override banderak izan behar ditu. Pathprefix \n" -"fitxategi-izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" -"Debian artxiboko erabilera-adibide bat:\n" +"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" +"Debian artxiboko erabilera argibide bat:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" +" -h Laguntza testu hau\n" " --md5 Kontrolatu MD5 sortzea\n" " -s=? Iturburuaren override fitxategia\n" " -q Isilik\n" -" -d=? Hautatu aukerako cachearen datu-basea\n" -" --no-delink Gaitu delink arazketa-modua\n" -" --contents Kontrolatu eduki-fitxategia sortzea\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat" +" -d=? Hautatu aukerako katxearen datu-basea\n" +" --no-delink Gaitu delink arazketa modua\n" +" --contents Kontrolatu eduki fitxategia sortzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" +msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -444,424 +451,424 @@ msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " "mesedez datubasea ezabatu eta birsortu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "Artxiboak ez du kontrol-erregistrorik" +msgstr "Artxiboak ez du kontrol erregistrorik" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Ezin da %s direktorioa irakurri\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Ezin da %s atzitu\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Erroreak fitxategiari dagozkio " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Huts egin du %s ebaztean" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Huts egin dute zuhaitz-urratsek" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Huts egin du %s irekitzean" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Huts egin du %s esteka irakurtzean" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Huts egin du %s desestekatzean" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Ezin izan da %s %s(r)ekin estekatu" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "Artxiboak ez du pakete-eremurik" +msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Barne Errorea, ezin da %s atala kokatu" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ezin da %s ireki" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Huts egin du %s override fitxategia irakurtzean" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "'%s' Kompresio Algoritmo Ezezaguna" +msgstr "'%s' Konpresio Algoritmo Ezezaguna" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Huts egin du FILE* sortzean" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Huts egin du sardetzean" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Konprimatu Umeak" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "deskonpresorea" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" -msgstr "Adierazpen erregularren konpilazio-errorea - %s" +msgstr "Adierazpen erregularren konpilazio errorea - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " edo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" +msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" -"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" +"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " +msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" +msgstr "Ezin da bertsio berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." +msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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" +msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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." +msgstr "Ezin izan da Iturburu zerrenda irakurri." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Deskonprimitu ondoren, %sB libratuko 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:846 cmdline/apt-get.cc:1989 +#: 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." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, 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:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,31 +876,31 @@ msgid "" " ?] " msgstr "" "Egin nahi duzunak kalte larriak eragin ditzake\n" -"Jarratzeko, idatzi '%s' esaldia\n" +"Jarraitzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: 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" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +908,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" +msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,75 +959,119 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Ezin da zerrenda-direktorioa blokeatu" +msgstr "Ezin da zerrenda direktorioa blokeatu" + +#: 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:1384 +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " -"zaharrak erabili dira haien ordez." +"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " +"behar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "'apt-get autoremove' erabili ezabatzeko." + +#: 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, dirudienez AutoRemover-ek gertatu behar ez zen apurtu du\n" +"Mesedez programa errore txosten bat bete mesedez." + +#. +#. 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 "Informazio honek arazoa konpontzen lagun dezake:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Ezin izan da %s zeregina aurkitu" + +#: 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:1516 +#: 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:1546 +#: 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: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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1079,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1040,130 +1091,117 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1569 -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 "" -"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" -"izango, eta pakete horren errorearen berri ematea komeni da." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Informazio honek arazoa konpontzen lagun dezake:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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:1894 +#: 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:1924 cmdline/apt-get.cc:2153 +#: 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" +msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1968 +#: 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:1992 +#: 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:1997 +#: 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" +msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" +msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Eskuratu %s iturubura\n" +msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2065 +#: 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:2077 +#: 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:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" +msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2095 +#: 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:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2130 +#: 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" +"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2158 +#: 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" +msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s: ez du eraikitze-mendekotasunik.\n" +msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1171,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:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1180,32 +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:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, 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:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." +msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" +msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1220,6 +1258,8 @@ msgid "" " 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" @@ -1235,7 +1275,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1250,37 +1290,39 @@ msgstr "" " apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n" " apt-get [aukerak] source pkg1 [pkg2 ...]\n" "\n" -"apt-get paketeak deskargatu eta instalatzeko komando-lerroko interfaze soil\n" +"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil\n" "bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n" "dira: update eta install.\n" "\n" "Komandoak:\n" -" update - Eskuratu pakete-zerrenda berriak\n" -" upgrade - Egin bertsio-berritzea\n" +" update - Eskuratu pakete zerrenda berriak\n" +" upgrade - Egin bertsio berritzea\n" " install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n" " remove - Kendu paketeak\n" -" source - Deskargatu iturburu-artxiboak\n" -" build-dep - Konfiguratu iturburu-paketeen eraikitze-dependentziak\n" -" dist-upgrade - Banaketaren bertsio-berritzea: ikus apt-get(8)\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" +" dist-upgrade - Banaketaren bertsio berritzea: ikus apt-get(8)\n" " dselect-upgrade - Jarraitu dselect hautapenak\n" -" clean - Ezabatu deskargatutako artxibo-fitxategiak\n" -" autoclean - Ezabatu deskargatutako artxibo-fitxategi zaharrak\n" +" clean - Ezabatu deskargatutako artxibo fitxategiak\n" +" autoclean - Ezabatu deskargatutako artxibo fitxategi zaharrak\n" " check - Egiaztatu ez dagoela hautsitako mendekotasunik\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau.\n" -" -q Egunkarian erregistratzeko irteera - progresio-adierazlerik gabe\n" +" -h Laguntza testu hau.\n" +" -q Egunkarian erregistratzeko irteera - progresio adierazlerik gabe\n" " -qq Irteerarik ez, erroreentzat izan ezik\n" " -d Deskargatu bakarrik - EZ instalatu edo deskonprimitu artxiboak\n" " -s Ekintzarik ez. Simulazio bat egiten du\n" " -y Galdera guztiei Bai erantzun, galdetu gabe\n" -" -f Saiatu jarraitzen, osotasun-egiaztapenak huts egiten badu\n" +" -f Saiatu jarraitzen, osotasun egiaztapenak huts egiten badu\n" " -m Saiatu jarraitzen, artxiboak ezin badira lokalizatu\n" " -u Erakutsi bertsio-berritutako paketeen zerrenda ere\n" -" -b Sortu iturburu-paketea lortu ondoren\n" +" -b Sortu iturburu paketea lortu ondoren\n" " -V Erakutsi bertsio-zenbaki xeheak\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n" "Informazio eta aukera gehiago nahi izanez gero, ikus apt-get(8), \n" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" @@ -1324,7 +1366,7 @@ msgstr "" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Pakete-erregistro ezezaguna!" +msgstr "Pakete erregistro ezezaguna!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1341,37 +1383,41 @@ msgid "" msgstr "" "Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n" "\n" -"apt-sortpkgs pakete-fitxategiak ordenatzeko tresna soil bat da. Zein\n" +"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n" "motatako fitxategia den adierazteko -s aukera erabiltzen da.\n" "\n" "Aukerak:\n" -" -h Laguntza-testu hau\n" -" -s Erabili iturburu-fitxategien ordenatzea\n" -" -c=? Irakurri konfigurazio-fitxategi hau\n" -" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" +" -h Laguntza testu hau\n" +" -s Erabili iturburu fitxategien ordenatzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" msgstr "Okerreko ezarpen lehenetsia!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Jarraitzeko, sakatu Sartu." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Deskargaturiko .deb fitxategi guztiak ezabatu nahi al dituzu?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1382,188 +1428,188 @@ msgstr "" msgid "Merging available information" msgstr "Eskuragarrien datuak biltzen" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "%u TAR goiburu-mota ezezaguna, %s kidea" +msgstr "%u TAR goiburu mota ezezaguna, %s kidea" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "Artxibo-sinadura baliogabea" +msgstr "Artxibo sinadura baliogabea" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Errorea artxiboko kidearen goiburua irakurtzean" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Artxiboko kidearen goiburua baliogabea da" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Artxiboa laburregia da" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Huts egin artxibo-goiburuak irakurtzean" +msgstr "Huts egin artxibo goiburuak irakurtzean" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Huts egin du hash-elementua lokalizatzean!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Huts egin du desbideratzea lokalizatzean" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion-n barne errorea" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" +msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "%s bide-izena luzeegia da" +msgstr "%s bidea luzeegia da" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s behin baino gehiagotan deskonprimitzen" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "%s direktorioa desbideratuta dago" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketea desbideratze-helburuan %s/%s idazten saiatzen ari da" +msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Desbideratzearen bide-izena luzeegia da" +msgstr "Desbideratzearen bidea luzeegia da" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "Bide-izena luzeegia da" +msgstr "Bidea luzeegia da" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Ezin da %s irakurri" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ezin da daturik lortu %s(e)tik" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Huts egin du %s kentzean" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ezin da %s sortu" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Huts egin du %sinfo-tik datuak lortzean" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" +msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Pakete Zerrenda irakurtzen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean" +msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Barne errorea pakete Izen bat eskuratzerakoan" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Fitxategi zerrendaketa irakurtzen" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1574,78 +1620,78 @@ msgstr "" "baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen " "bertsio bera!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Huts egin du %sinfo/%s zerrenda-fitxategia irakurtzean" +msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Barne errorea nodo bat eskuratzerakoan" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Desbideratze-fitxategia hondatuta dago" +msgstr "Desbideratze fitxategia hondatuta dago" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Lerro baliogabea desbideratze-fitxategian: %s" +msgstr "Lerro baliogabea desbideratze fitxategian: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Barne errorea desbideratze bat gehitzean" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Paketearen cachea hasieratu behar da lehendabizi" +msgstr "Paketearen katxea hasieratu behar da lehendabizi" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Okerreko ConfFile sekzioa egoera-fitxategian. Desplazamendua %lu" +msgstr "Okerreko ConfFile sekzioa egoera fitxategian. Desplazamendua %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Errorea MD5 analizatzean. Desplazamendua %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Ez da baliozko DEB artxiboa; '%s' kidea falta da" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" +"Hau ez da baliozko DEB fitxategi bat, ez du '%s', '%s' edo '%s' atalik " -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Ezin izan da %s(e)ra aldatu" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Barne Errorea, ezin da atala kokatu" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu" +msgstr "Ezin izan da baliozko kontrol fitxategi bat lokalizatu" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Kontrol fitxategi ezin analizagarria" @@ -1666,29 +1712,28 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD okerra" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Huts egin du atzitzean" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Huts egin du aldaketa-ordua ezartzean" +msgstr "Huts egin du aldaketa ordua ezartzean" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1744,15 +1789,15 @@ msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Konexioaren denbora-muga" +msgstr "Konexioa denboraz kanpo" #: methods/ftp.cc:335 msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" -msgstr "Irakurketa-errorea" +msgstr "Irakurketa errorea" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." @@ -1760,11 +1805,11 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokolo-hondatzea" +msgstr "Protokolo hondatzea" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "Idazketa-errorea" +msgstr "Idazketa errorea" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1773,7 +1818,7 @@ msgstr "Ezin izan da socket-a sortu" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" -"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du" +"Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1802,7 +1847,7 @@ msgstr "Ezin da PORT komandoa bidali" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Helbide-familia baliogabea: %u (AF_*)" +msgstr "Helbide familia ezezagunaa: %u (AF_*)" #: methods/ftp.cc:798 #, c-format @@ -1811,13 +1856,13 @@ msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Datu-socket konexioak denbora-muga gainditu du" +msgstr "Datu-socket konexioak denbora muga gainditu du" #: methods/ftp.cc:825 msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:957 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" @@ -1828,12 +1873,12 @@ msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datu-socketak denbora-muga gainditu du" +msgstr "Datu-socketak denbora muga gainditu du" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datu-transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" +msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1844,60 +1889,60 @@ msgstr "Kontsulta" msgid "Unable to invoke " msgstr "Ezin da deitu " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" +"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" @@ -1907,34 +1952,33 @@ msgstr "Ezin da konektatu -> %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Ezin da eraztuna ebatzi: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." +msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:204 +#: 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:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "" -"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)" +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:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1952,431 +1996,456 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:521 +#: 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:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." +msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." -#: methods/http.cc:584 +#: 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:599 +#: 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:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" -msgstr "Datu-formatu ezezaguna" +msgstr "Datu formatu ezezaguna" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" -msgstr "Konexioaren denbora-muga gainditu da" +msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Huts fitxategia mozterakoan" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" -msgstr "Barne-errorea" +msgstr "Barne errorea" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Ezin da fitxategi huts baten mmap egin" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "%s konfigurazio-fitxategia irekitzen" - -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "%d lerroa luzeegia da (gehienez %d)" +msgstr "%s konfigurazio fitxategia irekitzen" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik." +msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Sintasi errorea %s:%u: Gaizki eratutako" +msgstr "Sintaxi errorea %s:%u: Gaizki eratutako" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren" +msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" +msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" +msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" +msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" +msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" +msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errorea!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Eginda" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Ez da ezagutzen komando-lerroko '%c' aukera [%s]." +msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Ez da ulertzen komando-lerroko %s aukera" +msgstr "Ez da ulertzen komando lerroko %s aukera" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Komando-lerroko %s aukera ez da boolearra." +msgstr "Komando lerroko %s aukera ez da boolearra." -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s aukerak argumentu bat behar du." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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 aukera: konfigurazio-elementuaren zehaztapenak = eduki behar du." +"%s aukera: konfigurazio elementuaren zehaztapenak = eduki behar du." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "'%s' aukera luzeegia da" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Ezin da atzitu %s muntatze-puntua" +msgstr "Ezin da atzitu %s muntatze puntua" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Ezin da %s(e)ra aldatu" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-" +"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Ezin izan da %s blokeo-fitxategia ireki" +msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "%s azpiprozesuak segmentazio-hutsegitea jaso du." +msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "%s azpiprozesuak errore-kode bat itzuli du (%u)" +msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Paketeen cachea hutsik" +msgstr "Paketeen katxea hutsik" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Paketeen cache-fitxategia hondatuta dago" +msgstr "Paketeen katxe fitxategia hondatuta dago" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Paketeen cache-fitxategiaren bertsioa ez da bateragarria" +msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT honek ez du '%s' bertsio sistema onartzen" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Paketeen cachea beste arkitektura batentzat sortuta dago" +msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Mendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Aurremendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Iradokizuna:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Gomendioa:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gatazka:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ordeztea:" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zaharkitzea:" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Apurturik" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "garrantzitsua" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "beharrezkoa" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estandarra" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "aukerakoa" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "estra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Hautagaien bertsioak" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Egoera argibideak irakurtzen" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Huts egin du %s EgoeraFitxategia irekitzean" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Ezin da %s pakete-fitxategia analizatu (1)" +msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Ezin da %s pakete-fitxategia analizatu (2)" +msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." +msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" +msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "'%s' mota ez da ezagutzen %u lerroan %s iturburu-zerrendan" +msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" +msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2388,19 +2457,19 @@ msgstr "" "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " "aukera." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "'%s' motako indize-fitxategirik ez da onartzen" +msgstr "'%s' motako indize fitxategirik ez da onartzen" -#: apt-pkg/algorithms.cc:241 +#: 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 paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2408,181 +2477,205 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " +"zaharrak erabili dira haien ordez." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "%spartial artxibo-direktorioa falta da." +msgstr "%spartial artxibo direktorioa falta da." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "%li fitxategia jasotzen %li-tik" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." +msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:377 +#: 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" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "'%s' pakete-sistema ez da onartzen" +msgstr "'%s' pakete sistema ez da onartzen" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" +msgstr "Ezin da pakete sistemaren mota egokirik zehaztu" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ezin da %s atzitu." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki." +msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez" +msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Cachearen bertsio-sistema ez da bateragarria" +msgstr "Katxearen bertsio sistema ez da bateragarria" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." +msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." +msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." +msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" +msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" +msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Fitxategi-erreferentziak biltzen" +msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "S/I errorea iturburu-cachea gordetzean" +msgstr "S/I errorea iturburu katxea gordetzean" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Egiaztapena ez dator bat" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n" +msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2591,7 +2684,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2600,15 +2693,15 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " +"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2617,7 +2710,7 @@ msgstr "Tamaina ez dator bat" msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2626,47 +2719,60 @@ msgstr "" "%s CD-ROM muntatze puntua erabiltzen\n" "CD-ROM-a muntatzen\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Egiaztatzen... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Gordetako Etiketa: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM Desmuntatzen...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura " +"aurkitu dira\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n" +msgid "Found label '%s'\n" +msgstr "Aurkitutako Etiketa: '%s' \n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2675,98 +2781,123 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "jatorri zerrenda berria idazten\n" +msgstr "Jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "Diskarentzako jaotrri sarrerak:\n" - -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM Desmuntatzen..." +msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n" +msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" +"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "%s Instalatzen" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s konfiguratzen" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s kentzen" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "'%s' direktorioa falta da" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "%s konfiguratzen" +msgid "Processing triggers for %s" +msgstr "%s-ren abiarazleak prozesatzen" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s kentzen" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" +#: 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" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "%s fitxategia ezin izan da ireki" +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/fi.po b/po/fi.po index 03aed80..7e2a83c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,15 +1,15 @@ # translation of fi.po to Finnish # Finnish translation of apt. # This file is put in the public domain. -# Tapio Lehtonen , 2004-2006. +# Tapio Lehtonen , 2004-2006,2008. # # msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-29 16:06+0300\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\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" @@ -17,145 +17,153 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Pakettien kokonaismäärä : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Tavallisia paketteja: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Aitoja näennäispaketteja: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Yksinkertaisia näennäispaketteja: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Sekanäennäispaketteja: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Puuttuu: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Eri versioita yhteensä: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Eri kuvauksia yhteensä: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Riippuvuuksia yhteensä: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Versio/tdsto suhteita yht: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Kuvaus/tdsto suhteita yht: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Tarjoamiskuvauksia yhteensä: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Erilaisia merkkijonoja yhteensä: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Versioriippuvuustila yhteensä: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Löysää tilaa yhteensä: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ei löydy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ei mitään)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" +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:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -178,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -213,8 +221,8 @@ 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" -" dotty - Tee paketeista graafit GraphVis-muodossa\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" "\n" @@ -301,7 +309,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -310,32 +318,32 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Tapahtui virhe käsiteltäessa kansiota %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +425,26 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -444,278 +452,278 @@ msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " "on tietokanta poistettava ja luotava uudelleen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kansiota %s ei voi lukea\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Tdstolle %s ei toimi stat\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Tiedostossa virheitä " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Osoitteen %s selvitys ei onnistunut" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Puun läpikäynti ei onnistunut" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ei onnistunut" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ei onnistunut" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linkin %s -> %s luonti ei onnistunut" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "FILE* luominen ei onnistunut" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "fork ei onnistunut" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Compress-lapsiprosessi" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "purkaja" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " tai" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -723,145 +731,145 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Lähteiden luetteloa ei pystynyt lukemaan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,28 +880,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +909,47 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,75 +960,120 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " -"käytetty vanhoja. " +"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " +"vaadittuja:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Poista ne komennolla \"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 "" +"Hmm, nähtävästi AutoRemover tuhosi jotain, mitä ei pitäisi tapahtua.\n" +"Tekisitkö vikailmoituksen apt:sta." + +#. +#. 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 "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Tehtävää %s ei löytynyt" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1081,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1039,130 +1092,116 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1569 -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." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1170,7 +1209,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1179,32 +1218,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1219,6 +1258,8 @@ msgid "" " 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" @@ -1234,7 +1275,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1257,11 +1298,13 @@ msgstr "" " upgrade - Tee päivitys\n" " install - Asenna uusia paketteja (esim. libc6 eikä libc6.deb)\n" " remove - Poista paketteja\n" +" autoremove - Poista kaikki käyttämättömät paketit\n" +" purge - Poista paketit asennustiedostoineen\n" " source - Nouda lähdekoodiarkistoja\n" " build-dep - Määritä paketointiriippuvuudet lähdekoodipaketeille\n" " dist-upgrade - Koko jakelun päivitys, katso apt-get(8)\n" " dselect-upgrade - Noudata dselect:n valintoja\n" -" clean - Poista noudetut tiedostot\n" +" clean - Poista noudetut pakettitiedostot\n" " autoclean - Poista vanhat noudetut tiedostot\n" " check - Tarkasta ettei ole tyydyttämättömiä riippuvuuksia\n" "\n" @@ -1275,7 +1318,7 @@ msgstr "" " -f Yritä jatkaa jos eheystarkastus löysi virheen\n" " -m Yritä jatkaa jos arkistojen sijainti ei selviä\n" " -u Näytä luettelo myös päivitetyistä paketeista\n" -" -b Paketoi lähdekoodipaketti noudon jälkeen\n" +" -b Käännä lähdekoodipaketti noudon jälkeen\n" " -V Näytä pitkät versionumerot\n" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" @@ -1352,25 +1395,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Oletusasetus ei kelpaa!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Jatka painamalla Enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Haluatko poistaa aiemmin noudettuja .deb-tiedostoja?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Tapahtui virheitä purettaessa. Tehdään asennettujen" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pakettien asetukset. Samat virheet voivat tulla toiseen kertaan" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "tai tyydyttämättömät riippuvuudet aiheuttavat virheitä. Tämä ei haittaa" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1381,188 +1428,188 @@ msgstr "" msgid "Merging available information" msgstr "Yhdistetään saatavuustiedot" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Arkiston tarkistussumma on virheellinen" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Arkiston tiedoston otsikko on virheellinen" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkisto on pienempi kuin pitäisi" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Arkiston otsikoiden luku ei onnistunut" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hajautusalkiota ei löytynyt!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Korvautuksen varaus ei onnistunut" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion: sisäinen virhe" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Korvautuksen kaksoislisäys %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Polku %s on liian pitkä" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Purettiin %s useammin kuin kerran" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Kansio %s on korvautunut" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Korvautuspolku on liian pitkä" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Solmua ei löytynyt sen hajautuslokerosta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Polku on liian pitkä" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Tiedostoa %s ei voi lukea" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Tiedoston %s poistaminen ei onnistunut" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Tiedostoa %s ei voi luoda" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "stat ei toimi: %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Luetaan pakettiluetteloita" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Tapahtui sisäinen virhe haettaessa paketin nimeä" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Luetaan tiedostoluetteloa" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1573,77 +1620,79 @@ msgstr "" "ei voi palauttaa, tyhjennä tiedosto ja asenna välittömästi paketin sama " "versio uudelleen!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Tapahtui virhe luettelotiedostoa %sinfo/%s luettaessa" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Tapahtui sisäinen virhe varattaessa tiedostosolmua" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Tapahtui virhe avattaessa korvautustiedostoa %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Korvautustiedosto on turmeltunut" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Virheellinen rivi korvautustiedostossa: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakettivarasto on ensin alustettava" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Paketin otsikkoa ei löydy, kohta %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu osat \"%s\" ja \"%s\"." +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Tämä ei ole kelvollinen DEB-arkisto, jokin osista \"%s\", \"%s\" tai \"%s\" " +"puuttuu." -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Kansioon %s vaihto ei onnistunut" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Kelvollista ohjaustiedostoa ei löydy" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Ohjaustiedosto ei jäsenny" @@ -1664,26 +1713,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Väärä romppu" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Komento stat ei toiminut" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1745,7 +1793,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1757,7 +1805,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1811,7 +1859,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1838,59 +1886,59 @@ msgstr "Kysely" msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" @@ -1900,36 +1948,36 @@ msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Avainrengasta \"%s\" ei saatavilla" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)" +"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1947,427 +1995,452 @@ msgstr "Putkea %s ei voitu avata" msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Tiedoston typistäminen ei onnistunut" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Sisäinen virhe" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Rivi %d on liian pitkä (enintään %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Virhe!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Valmis" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Komentorivin valitsin %s on tuntematon" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Komentorivin valitsin %s ei ole totuusarvoinen" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valitsin %s tarvitsee parametrin" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valitsin \"%s\" on liian pitkä" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Virheellinen toiminto %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Kansioon %s vaihto ei onnistu" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Pakettivarasto on tyhjä" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakettivarasto on turmeltunut" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakettivaraston versio on yhteensopimaton" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Riippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Esiriippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Ehdotukset" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Suosittelut" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ristiriidat" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Korvaavuudet" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Rikkoo" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "tärkeä" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "välttämätön" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "perus" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valinnainen" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ylimääräinen" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Luetaan tilatiedot" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Tilatiedoston %s avaaminen ei onnistunut" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2378,18 +2451,18 @@ msgstr "" "s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta " "jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" -#: apt-pkg/algorithms.cc:241 +#: 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 "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2397,183 +2470,207 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " +"käytetty vanhoja. " + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Noudetaan tiedosto %li / %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Menetelmän ajuria %s ei löytynyt" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "stat %s ei onnistu." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash Sum täsmää" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2582,7 +2679,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2591,7 +2688,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2599,7 +2696,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2608,7 +2705,7 @@ msgstr "Koko ei täsmää" msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2617,49 +2714,60 @@ msgstr "" "Käytetään rompun liitoskohtaa %s\n" "Liitetään romppu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Tunnistetaan... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Irrotetaan romppu...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i " -"ja allekirjoituksia %i\n" +"Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, " +"käännösten %zu ja allekirjoituksia löytyi %zu\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Löytyi nimiö: \"%s\"\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2668,96 +2776,118 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Irrotetaan romppu..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Asennetaan %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Tehdään asetukset: %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Poistetaan %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Suoritetaan jälkiasennusliipaisin %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Kansio \"%s\" puuttuu." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Tehdään asetukset: %s" +msgid "Processing triggers for %s" +msgstr "Käsitellään %s:n liipaisimia" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Poistetaan %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts " +"liittämättä?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" msgstr "Tiedostoa %s ei voitu avata" @@ -2765,16 +2895,5 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" -#~ msgid "File date has changed %s" -#~ msgstr "Tiedoston uusi päiväys %s" - -#~ msgid "Reading file list" -#~ msgstr "Luetaan tiedostoluetteloa" - -#, fuzzy -#~ msgid "Could not execute " -#~ msgstr "Lukkoa %s ei saada" - -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "" -#~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Tila loppui kesken dynaamiselta MMap:lta" diff --git a/po/fr.po b/po/fr.po index 6e0ad01..c73caad 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,162 +1,171 @@ # translation of fr.po to French +# translation of apt to French # Advanced Package Transfer - APT message translation catalog # French messages # # Pierre Machard , 2002,2003,2004. -# Christian Perrier , 2004-2005, 2006. +# Christian Perrier , 2004-2005, 2006, 2007, 2008. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-02 09:59+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-12 22:42+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \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" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Le paquet %s de version %s contient une dépendance absente :\n" +msgstr "Le paquet %s de version %s contient une dépendance absente :\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Nombre total de paquets : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Nombre total de paquets : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " Paquets ordinaires : " +msgstr " Paquets ordinaires : " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " Paquets entièrement virtuels : " +msgstr " Paquets entièrement virtuels : " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " Paquets virtuels simples : " +msgstr " Paquets virtuels simples : " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Paquets virtuels mixtes : " +msgstr " Paquets virtuels mixtes : " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " -msgstr " Manquants : " +msgstr " Manquants : " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "Nombre de versions distinctes : " +msgstr "Nombre de versions distinctes : " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Nombre de descriptions distinctes : " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "Nombre de dépendances : " +msgstr "Nombre de dépendances : " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "Nombre de relations version/fichier : " +msgstr "Nombre de relations version/fichier : " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Nombre de relations description/fichier : " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "Nombre de relations « Provides » : " +msgstr "Nombre de relations « Provides » : " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Nombre de motifs rationnels : " +msgstr "Nombre de motifs rationnels : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Espace occupé par les versions des dépendances : " +msgstr "Espace occupé par les versions des dépendances : " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Espace disque gaspillé : " +msgstr "Espace disque gaspillé : " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Total de l'espace attribué : " +msgstr "Total de l'espace attribué : " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "Fichier %s désynchronisé." +msgstr "Fichier %s désynchronisé." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Vous devez fournir exactement un motif" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" -msgstr "Aucun paquet n'a été trouvé" +msgstr "Aucun paquet n'a été trouvé" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "Fichiers du paquet :" +msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Le cache est désynchronisé, impossible de référencer un fichier" +msgstr "Le cache est désynchronisé, impossible de référencer un fichier" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Paquets étiquetés :" +msgstr "Paquets étiquetés :" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" -msgstr "(non trouvé)" +msgstr "(non trouvé)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " -msgstr " Installé : " +msgstr " Installé : " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(aucun)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " -msgstr " Candidat : " +msgstr " Candidat : " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Étiquette de paquet : " +msgstr " Étiquette de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" -msgstr " Table de version :" +msgstr " Table de version :" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s pour %s %s est compilé le %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -179,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -194,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 "" -"Usage : apt-cache [options] commande\n" +"Usage : apt-cache [options] commande\n" " apt-cache [options] add fichier1 [fichier2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" @@ -202,56 +211,56 @@ msgstr "" "apt-cache est un outil de bas niveau pour manipuler les fichiers de cache\n" "pour les binaires, et pour en obtenir des informations.\n" "\n" -"Commandes :\n" +"Commandes :\n" " add - Ajoute un paquet au cache source\n" " gencaches - Construit le cache des sources et celui des binaires\n" -" showpkg - Affiche quelques informations générales pour un unique paquet\n" +" showpkg - Affiche quelques informations générales pour un unique paquet\n" " showsrc - Affiche les enregistrements des sources\n" " stats - Affiche quelques statistiques de base\n" -" dump - Affiche la totalité des fichiers dans un formulaire succinct\n" +" dump - Affiche la totalité des fichiers dans un formulaire succinct\n" " dumpavail - Affiche une liste de fichiers disponibles sur la sortie " "standard\n" -" unmet - Affiche les dépendances manquantes\n" +" unmet - Affiche les dépendances manquantes\n" " search - Cherche une expression rationnelle dans la liste des paquets\n" " show - Affiche la description du paquet\n" -" depends - Affiche toutes les dépendances d'un paquet\n" -" rdepends - Affiche les dépendances inverses d'un paquet\n" -" pkgnames - Liste le nom de tous les paquets\n" -" dotty - Génère un graphe des paquets pour GraphVis\n" -" xvcg - Génère un graphe des paquets pour xvcg\n" -" policy - Affiche l'étiquetage (Pin) en vigueur\n" +" depends - Affiche toutes les dépendances d'un paquet\n" +" rdepends - Affiche les dépendances inverses d'un paquet\n" +" pkgnames - Liste le nom de tous les paquets du système\n" +" dotty - Génère un graphe des paquets pour GraphViz\n" +" xvcg - Génère un graphe des paquets pour xvcg\n" +" policy - Affiche l'étiquetage (Pin) en vigueur\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" " -p=? Le cache des paquets\n" " -s=? Le cache des sources\n" -" -q Enlève l'indicateur de progression\n" -" -i Affiche seulement les dépendances importantes pour la commande " -"« unmet »\n" +" -q Enlève l'indicateur de progression\n" +" -i Affiche seulement les dépendances importantes pour la commande " +"« unmet »\n" " -c=? Lit ce fichier de configuration\n" -" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" +" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" "Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n" "d'informations.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" msgstr "" -"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -"Veuillez répéter cette opération pour tous les disques de votre jeu de " -"cédéroms." +"Veuillez répéter cette opération pour tous les disques de votre jeu de " +"cédéroms." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Les arguments ne sont pas en parité" +msgstr "Les arguments ne sont pas en parité" #: cmdline/apt-config.cc:76 msgid "" @@ -268,18 +277,18 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Usage : apt-config [options] commande\n" +"Usage : apt-config [options] commande\n" "\n" "apt-config est un outil simple pour lire le fichier de configuration d'APT\n" "\n" -"Commandes :\n" +"Commandes :\n" " shell - Mode console\n" " dump - Affiche la configuration\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" " -c=? Lit ce fichier de configuration\n" -" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" +" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -299,52 +308,52 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n" +"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n" "\n" "apt-extracttemplates est un outil pour extraire la configuration et les\n" "informations des gabarits des paquets Debian\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" -" -t Place le répertoire temporaire\n" +" -t Place le répertoire temporaire\n" " -c=? Lit ce fichier de configuration\n" -" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" +" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" -msgstr "Impossible d'écrire sur %s" +msgstr "Impossible d'écrire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Erreur lors du traitement du répertoire %s" +msgstr "Erreur lors du traitement du répertoire %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" +msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -385,582 +394,581 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Usage : apt-ftparchive [options] commande\n" -"Commandes : paquets binarypath [fichier d'« override » [chemin du " -"préfixe]]\n" -" sources srcpath [fichier d'« override » [chemin du préfixe]]\n" +"Usage : apt-ftparchive [options] commande\n" +"Commandes : paquets binarypath [fichier d'« override » [chemin du préfixe]]\n" +" sources srcpath [fichier d'« override » [chemin du préfixe]]\n" " contents path\n" " release path\n" " generate config [groupes]\n" " clean config\n" "\n" -"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n" -"supporte de nombreux types de génération, d'une automatisation complète à\n" +"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n" +"supporte de nombreux types de génération, d'une automatisation complète à\n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" -"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n" -"Le fichier des paquets contient les contenus de tous les champs de contrôle\n" -"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n" -"fichier d'« override » est accepté pour forcer la valeur des priorités et\n" +"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n" +"Le fichier des paquets contient les contenus de tous les champs de contrôle\n" +"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n" +"fichier d'« override » est accepté pour forcer la valeur des priorités et\n" "des sections\n" "\n" -"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n" -"d'un arbre de .dscs. L'option --source-override peut être employée pour\n" -"spécifier un fichier src d'« override »\n" +"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n" +"d'un arbre de .dscs. L'option --source-override peut être employée pour\n" +"spécifier un fichier src d'« override »\n" "\n" -"Les commandes « packages » et « sources » devraient être démarrées à la\n" -"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n" -"recherche récursive et le fichier d'« override » devrait contenir les\n" -"drapeaux d'annulation. « Pathprefix » est ajouté au champ du non de\n" -"fichier s'il est présent. Exemple d'utilisation d'archive Debian :\n" +"Les commandes « packages » et « sources » devraient être démarrées à la\n" +"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n" +"recherche récursive et le fichier d'« override » devrait contenir les\n" +"drapeaux d'annulation. « Pathprefix » est ajouté au champ du non de\n" +"fichier s'il est présent. Exemple d'utilisation d'archive Debian :\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" -" --md5 Contrôle la génération des MD5\n" -" -s=? Fichier d'« override » pour les sources\n" +" --md5 Contrôle la génération des MD5\n" +" -s=? Fichier d'« override » pour les sources\n" " -q Silencieux\n" -" -d=? Sélectionne la base de données optionnelle de cache\n" -" --no-delink Permet le mode de débogage délié\n" -" --contents Contrôle la génération de fichier\n" +" -d=? Sélectionne la base de données optionnelle de cache\n" +" --no-delink Permet le mode de débogage délié\n" +" --contents Contrôle la génération de fichier\n" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Aucune sélection ne correspond" +msgstr "Aucune sélection ne correspond" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Base de données corrompue, fichier renommé en %s.old" +msgstr "Base de données corrompue, fichier renommé en %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Base de données ancienne, tentative de mise à jour de %s\"" +msgstr "Base de données ancienne, tentative de mise à jour de %s\"" -#: ftparchive/cachedb.cc:76 +#: 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 "" -"Le format de la base de données n'est pas valable. Si vous mettez APT à " -"jour, veuillez supprimer puis recréer la base de données." +"Le format de la base de données n'est pas valable. Si vous mettez APT à " +"jour, veuillez supprimer puis recréer la base de données." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" +msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Impossible de statuer %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "L'archive n'a pas d'enregistrement de contrôle" +msgstr "L'archive n'a pas d'enregistrement de contrôle" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "A : Impossible de lire le contenu du répertoire %s\n" +msgstr "A : Impossible de lire le contenu du répertoire %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "A : Impossible de statuer %s\n" +msgstr "A : Impossible de statuer %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " -msgstr "E : " +msgstr "E : " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " -msgstr "A : " +msgstr "A : " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E : des erreurs sont survenues sur le fichier " +msgstr "E : des erreurs sont survenues sur le fichier " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Impossible de résoudre %s" +msgstr "Impossible de résoudre %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Échec du parcours de l'arbre" +msgstr "Échec du parcours de l'arbre" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " Délier %s [%s]\n" +msgstr " Délier %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Impossible de délier %s" +msgstr "Impossible de délier %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Impossible de lier %s à %s" +msgstr "*** Impossible de lier %s à %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "L'archive ne possède pas de champ de paquet" +msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" -msgstr "%s ne possède pas d'entrée « override »\n" +msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s ne possède pas d'entrée « source override »\n" +msgstr " %s ne possède pas d'entrée « source override »\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s ne possède pas également pas d'entrée « binary override »\n" +msgstr " %s ne possède pas également pas d'entrée « binary override »\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erreur interne, ne peut localiser la partie %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Échec de l'allocation de mémoire" +msgstr "realloc - Échec de l'allocation de mémoire" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Entrée « override » %s mal formée ligne %lu n° 1" +msgstr "Entrée « override » %s mal formée ligne %lu n° 1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Entrée « override » %s mal formée %lu n° 2" +msgstr "Entrée « override » %s mal formée %lu n° 2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Entrée « override » %s mal formée %lu n° 3" +msgstr "Entrée « override » %s mal formée %lu n° 3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Impossible de lire le fichier d'« override » %s" +msgstr "Impossible de lire le fichier d'« override » %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Algorithme de compression « %s » inconnu" +msgstr "Algorithme de compression « %s » inconnu" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "La sortie compressée %s a besoin d'un ensemble de compression" +msgstr "La sortie compressée %s a besoin d'un ensemble de compression" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Impossible de créer le tube IPC sur le sous-processus" +msgstr "Impossible de créer le tube IPC sur le sous-processus" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Impossible de créer FILE*" +msgstr "Impossible de créer FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Échec du fork" +msgstr "Échec du fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Fils compressé" +msgstr "Fils compressé" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Erreur interne, impossible de créer %s" +msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Impossible de créer un sous-processus IPC" +msgstr "Impossible de créer un sous-processus IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Impossible d'exécuter la compression " +msgstr "Impossible d'exécuter la compression " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" -msgstr "décompacteur" +msgstr "décompacteur" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" +msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Problème en déliant %s" +msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: 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" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" +msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "mais %s est installé" +msgstr "mais %s est installé" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "mais %s devra être installé" +msgstr "mais %s devra être installé" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "mais il n'est pas installé" +msgstr "mais il n'est pas installé" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "mais ne sera pas installé" +msgstr "mais ne sera pas installé" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "Les NOUVEAUX paquets suivants seront installés :" +msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "Les paquets suivants seront ENLEVÉS :" +msgstr "Les paquets suivants seront ENLEVÉS :" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "Les paquets suivants ont été conservés :" +msgstr "Les paquets suivants ont été conservés :" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "Les paquets suivants seront mis à jour :" +msgstr "Les paquets suivants seront mis à jour :" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" +msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Les paquets retenus suivants seront changés :" +msgstr "Les paquets retenus suivants seront changés :" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n" -"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" -"que vous êtes en train de faire." +"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n" +"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" +"que vous êtes en train de faire." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu mis à jour, %lu nouvellement installés, " +msgstr "%lu mis à jour, %lu nouvellement installés, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "%lu réinstallés, " +msgstr "%lu réinstallés, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "%lu remis à une version inférieure, " +msgstr "%lu remis à une version inférieure, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu à enlever et %lu non mis à jour.\n" +msgstr "%lu à enlever et %lu non mis à jour.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu partiellement installés ou enlevés.\n" +msgstr "%lu partiellement installés ou enlevés.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Correction des dépendances..." +msgstr "Correction des dépendances..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." -msgstr " a échoué." +msgstr " a échoué." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "Impossible de corriger les dépendances" +msgstr "Impossible de corriger les dépendances" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Impossible de minimiser le nombre des paquets mis à jour" +msgstr "Impossible de minimiser le nombre des paquets mis à jour" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 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." +msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." +msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." +msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Avertissement d'authentification ignoré.\n" +msgstr "Avertissement d'authentification ignoré.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " +msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "Certains paquets n'ont pas pu être authentifiés" +msgstr "Certains paquets n'ont pas pu être authentifiés" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Il y a des problèmes et -y a été employé sans --force-yes" +msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." +msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" -"Les paquets doivent être enlevés mais la désinstallation est désactivée." +"Les paquets doivent être enlevés mais la désinstallation est désactivée." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "Erreur interne. Le tri a été interrompu." +msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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" +msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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." +msgstr "La liste des sources ne peut être lue." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " -"courriel à apt@packages.debian.org." +"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par " +"courriel à apt@packages.debian.org." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" +msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Il est nécessaire de prendre %so dans les archives.\n" +msgstr "Il est nécessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" +"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n" +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:846 cmdline/apt-get.cc:1989 +#: 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" +msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " +"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " "triviale." # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "Oui, faites ce que je vous dis !" +msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:868 +#: 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 "" -"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n" -"Pour continuer, tapez la phrase « %s »\n" -" ?]" +"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n" +"Pour continuer, tapez la phrase « %s »\n" +" ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "Souhaitez-vous continuer [O/n] ? " +msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" +msgstr "Impossible de récupérer %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Certains fichiers n'ont pu être téléchargés." +msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: 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" +msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" -"get update ou essayer avec --fix-missing ?" +"Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" +"get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Note, sélection de %s au lieu de %s\n" +msgstr "Note, sélection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" +msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" +msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "Le paquet %s est un paquet virtuel fourni par :\n" +msgstr "Le paquet %s est un paquet virtuel fourni par :\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" -msgstr " [Installé]" +msgstr " [Installé]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Vous devez explicitement sélectionner un paquet à installer." +msgstr "Vous devez explicitement sélectionner un paquet à installer." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -968,270 +976,304 @@ msgid "" "is only available from another source\n" msgstr "" "Aucune version du paquet %s n'est disponible, mais il existe dans la base\n" -"de données. Cela signifie en général que le paquet est manquant, qu'il est " -"devenu obsolète\n" +"de données. Cela signifie en général que le paquet est manquant, qu'il est " +"devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "Cependant les paquets suivants le remplacent :" +msgstr "Cependant les paquets suivants le remplacent :" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s est déjà la plus récente version disponible.\n" +msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "La version « %s » de « %s » est introuvable" +msgstr "La version « %s » de « %s » est introuvable" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "La version « %s » de « %s » n'a pu être trouvée" +msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" -msgstr "La commande de mise à jour ne prend pas d'argument" +msgstr "La commande de mise à jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Impossible de verrouiller le répertoire de liste" +msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1384 +#: 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:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Le téléchargement de quelques fichiers d'index a échoué, ils ont été " -"ignorés, ou les anciens ont été utilisés à la place." +"Les paquets suivants ont été installés automatiquement et ne sont plus " +"nécessaires :" -#: cmdline/apt-get.cc:1403 +#: 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:1442 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n" +"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n" +"rapport de bogue pour le paquet « 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 "L'information suivante devrait vous aider à résoudre la situation : " + +#: 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:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Erreur interne, AllUpgrade a cassé le boulot !" +msgstr "Erreur interne, AllUpgrade a cassé le boulot !" + +#: 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:1493 cmdline/apt-get.cc:1529 +#: 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:1516 +#: 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" +msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" + +#: 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:1546 +#: 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 :" +msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" +"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Certains paquets ne peuvent être installés. Ceci peut signifier\n" -"que vous avez demandé l'impossible, ou bien, si vous utilisez\n" +"Certains paquets ne peuvent être installés. Ceci peut signifier\n" +"que vous avez demandé l'impossible, ou bien, si vous utilisez\n" "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:1569 -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 "" -"Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" -"probablement pas installable et vous devriez envoyer un rapport de bogue." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "L'information suivante devrait vous aider à résoudre la situation : " +"été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" -msgstr "Paquets défectueux" +msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "Les paquets supplémentaires suivants seront installés : " +msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "Paquets suggérés :" +msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" -msgstr "Paquets recommandés :" +msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "Calcul de la mise à jour... " +msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" -msgstr "Échec" +msgstr "Échec" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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 " +"Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:1894 +#: 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" +msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: 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" +msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:1992 +#: 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:1997 +#: 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" +msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2000 +#: 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" +msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Récupération des sources %s\n" +msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Échec lors de la récupération de quelques archives." +msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2065 +#: 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" +msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "La commande de décompactage « %s » a échoué.\n" +msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2078 +#: 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" +msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "La commande de construction « %s » a échoué.\n" +msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" -msgstr "Échec du processus fils" +msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2130 +#: 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 " +"Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2158 +#: 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" +msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2178 +#: 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" +msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " -"peut être trouvé" +"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " +"peut être trouvé" -#: cmdline/apt-get.cc:2282 +#: 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 dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " -"du paquet %s ne peut satisfaire à la version requise" +"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:2317 +#: 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" +"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " +"est trop récent" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" +msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Impossible d'activer les dépendances de construction" +msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" -msgstr "Modules reconnus :" +msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1246,6 +1288,8 @@ msgid "" " 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" @@ -1261,7 +1305,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1272,45 +1316,47 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Usage : apt-get [options] commandes\n" +"Usage : apt-get [options] commandes\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" " apt-get [options] source pkg1 [pkg2 ...]\n" "\n" -"apt-get est une interface simple en ligne de commande servant à\n" -"télécharger et à installer les paquets. Les commandes les plus\n" -"fréquemment employées sont update et install.\n" +"apt-get est une interface simple en ligne de commande servant à\n" +"télécharger et à installer les paquets. Les commandes les plus\n" +"fréquemment employées sont update et install.\n" "\n" -"Commandes :\n" -" update - Récupère les nouvelles listes de paquets\n" -" upgrade - Réalise une mise à jour\n" +"Commandes :\n" +" update - Récupère les nouvelles listes de paquets\n" +" upgrade - Réalise une mise à jour\n" " install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n" " remove - Supprime des paquets\n" -" source - Télécharge les archives de sources\n" +" autoremove - Supprime tous les paquets installés automatiquement\n" +" purge - Supprime et purge des paquets\n" +" source - Télécharge les archives de sources\n" " build-dep - Configure build-dependencies pour les paquets sources\n" -" dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n" -" dselect-upgrade - Suit les sélections de dselect\n" -" clean - Supprime dans le cache local tous les fichiers téléchargés\n" +" dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n" +" dselect-upgrade - Suit les sélections de dselect\n" +" clean - Supprime dans le cache local tous les fichiers téléchargés\n" " autoclean - Supprime dans le cache local les fichiers inutiles\n" -" check - Vérifie qu'il n'y a pas de rupture de dépendances\n" +" check - Vérifie qu'il n'y a pas de rupture de dépendances\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" " -q Message de sortie enregistrable - aucun indicateur de progression\n" -" -qq Aucun message de sortie, exceptés les messages d'erreur\n" -" -d Simple téléchargement - n'installe pas ou ne décompacte pas les " +" -qq Aucun message de sortie, exceptés les messages d'erreur\n" +" -d Simple téléchargement - n'installe pas ou ne décompacte pas les " "archives\n" -" -s N'agit pas. Réalise uniquement une simulation de commande\n" -" -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n" -" -f Tente de poursuivre si le contrôle d'intégrité échoue\n" +" -s N'agit pas. Réalise uniquement une simulation de commande\n" +" -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n" +" -f Tente de poursuivre si le contrôle d'intégrité échoue\n" " -m Tente de poursuivre si les archives ne sont pas localisables\n" -" -u Affiche une liste des paquets mis à jour\n" -" -b Construit la source du paquet après l'avoir récupérée\n" -" -V Affiche les numéros des versions de façon détaillée\n" +" -u Affiche une liste des paquets mis à jour\n" +" -b Construit la source du paquet après l'avoir récupérée\n" +" -V Affiche les numéros des versions de façon détaillée\n" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n" "Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n" -"apt.conf(5) pour plus d'information et d'option.\n" -" Cet APT a les « Super Cow Powers »\n" +"apt.conf(5) pour plus d'informations et d'option.\n" +" Cet APT a les « Super Cow Powers »\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1318,7 +1364,7 @@ msgstr "Atteint " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Réception de : " +msgstr "Réception de : " #: cmdline/acqprogress.cc:110 msgid "Ign " @@ -1331,7 +1377,7 @@ msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%so réceptionnés en %s (%so/s)\n" +msgstr "%so réceptionnés en %s (%so/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1345,13 +1391,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Changement de support : veuillez insérer le disque\n" -"« %s »\n" -"dans le lecteur « %s » et appuyez sur la touche Entrée\n" +"Changement de support : veuillez insérer le disque\n" +"« %s »\n" +"dans le lecteur « %s » et appuyez sur la touche Entrée\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Enregistrement de paquet inconnu !" +msgstr "Enregistrement de paquet inconnu !" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1366,368 +1412,372 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n" +"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n" "\n" "apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n" -"employée pour indiquer le type de fichier dont il s'agit.\n" +"employée pour indiquer le type de fichier dont il s'agit.\n" "\n" -"Options :\n" +"Options :\n" " -h Ce texte d'aide\n" " -s Trie le fichier source\n" " -c=? Lit ce fichier de configuration\n" -" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" +" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" "tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Mauvais paramètre par défaut !" +msgstr "Mauvais paramètre par défaut !" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Veuillez appuyer sur Entrée pour continuer." +msgstr "Veuillez appuyer sur Entrée pour continuer." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Voulez-vous effacer les fichiers .deb précédemment téléchargés ?" -#: dselect/install:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" -"Quelques erreurs sont apparues lors du décompactage. Nous allons configurer " +"Quelques erreurs sont apparues lors du décompactage. Nous allons configurer " "les" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" -msgstr "paquets qui ont été installés. Il peut en résulter d'autres erreurs" +msgstr "paquets qui ont été installés. Il peut en résulter d'autres erreurs" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"ou des erreurs provoquées par les dépendances manquantes. C'est bénin, " +"ou des erreurs provoquées par les dépendances manquantes. C'est bénin, " "seules les erreurs" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"précédant ce message sont importantes. Veuillez les corriger et\n" -"démarrer l'[I]nstallation une nouvelle fois." +"précédant ce message sont importantes. Veuillez les corriger et\n" +"démarrer l'[I]nstallation une nouvelle fois." #: dselect/update:30 msgid "Merging available information" msgstr "Fusion des informations disponibles" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Échec de création de tubes" +msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Impossible d'exécuter gzip " +msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" +msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" +msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Signature d'archive invalide" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Erreur de lecture de l'en-tête du membre d'archive" +msgstr "Erreur de lecture de l'en-tête du membre d'archive" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "En-tête du membre d'archive non-valide" +msgstr "En-tête du membre d'archive non-valide" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'archive est trop petite" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Échec de la lecture des en-têtes d'archive" +msgstr "Échec de la lecture des en-têtes d'archive" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode appelé sur un n½ud toujours lié" +msgstr "DropNode appelé sur un nœud toujours lié" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Impossible de situer l'élément haché !" +msgstr "Impossible de situer l'élément haché !" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Échec lors de l'allocation de la déviation" +msgstr "Échec lors de l'allocation de la déviation" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erreur interne dans AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s" +msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Addition double d'une déviation %s -> %s" +msgstr "Addition double d'une déviation %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Erreur d'écriture du fichier %s" +msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Échec de clôture du fichier %s" +msgstr "Échec de clôture du fichier %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Le chemin %s est trop long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Veuillez décompresser %s plus d'une fois" +msgstr "Veuillez décompresser %s plus d'une fois" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "Le répertoire %s est détourné" +msgstr "Le répertoire %s est détourné" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" +msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Le chemin de déviation est trop long" +msgstr "Le chemin de déviation est trop long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Le répertoire %s va être remplacé par un non-répertoire" +msgstr "Le répertoire %s va être remplacé par un non-répertoire" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Échec pour localiser le n½ud dans la table de hachage" +msgstr "Échec pour localiser le nœud dans la table de hachage" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Le chemin est trop long" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Écrase la correspondance de paquet sans version pour %s " +msgstr "Écrase la correspondance de paquet sans version pour %s " -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" +msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Impossible de lire %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossible de statuer pour %s." -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Impossible de supprimer %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Impossible de créer %s" +msgstr "Impossible de créer %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Impossible de statuer pour %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" -"Les répertoires info et temp doivent se trouver sur le même système de " +"Les répertoires info et temp doivent se trouver sur le même système de " "fichiers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Lecture des listes de paquets" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Impossible de changer pour le répertoire d'administration %sinfo" +msgstr "Impossible de changer pour le répertoire d'administration %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Erreur interne lors de l'obtention d'un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lecture de la liste de fichiers" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Impossible d'ouvrir le fichier de liste « %sinfo/%s ». Si vous ne parvenez " -"pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement " -"la même version du paquet !" +"Impossible d'ouvrir le fichier de liste « %sinfo/%s ». Si vous ne parvenez " +"pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement " +"la même version du paquet !" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Échec de la lecture du fichier de liste %sinfo/%s" +msgstr "Échec de la lecture du fichier de liste %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Erreur interne lors de l'obtention d'un N½ud" +msgstr "Erreur interne lors de l'obtention d'un Nœud" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions " +msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions " -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Le fichier des déviations est corrompu" +msgstr "Le fichier des déviations est corrompu" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ligne invalide dans le fichier des déviations : %s" +msgstr "Ligne invalide dans le fichier des déviations : %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Erreur interne en ajoutant une déviation" +msgstr "Erreur interne en ajoutant une déviation" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Le cache des paquets doit être initialisé en premier" +msgstr "Le cache des paquets doit être initialisé en premier" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Impossible de trouver un en-tête « Package: », décalage %lu" +msgstr "Impossible de trouver un en-tête « Package: », décalage %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu" +msgstr "Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu" +msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Ce n'est pas une archive DEB valide, partie « %s » manquante" +msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou " +"« %s »" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Impossible d'accéder à %s" +msgstr "Impossible d'accéder à %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Erreur interne, ne peut localiser le membre" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Impossible de localiser un fichier de contrôle valide" +msgstr "Impossible de localiser un fichier de contrôle valide" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Fichier de contrôle non traitable" +msgstr "Fichier de contrôle non traitable" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossible de lire la base de données %s du cédérom" +msgstr "Impossible de lire la base de données %s du cédé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 "" -"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre " -"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms" +"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre " +"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Mauvais cédérom" +msgstr "Mauvais cédérom" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -"Impossible de démonter le cédérom dans %s, il doit toujours être en cours " +"Impossible de démonter le cédérom dans %s, il doit toujours être en cours " "d'utilisation." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Disque non trouvé." +msgstr "Disque non trouvé." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Fichier non trouvé" +msgstr "Fichier non trouvé" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Impossible de statuer" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" +msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1736,78 +1786,78 @@ msgstr "Connexion en cours" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Impossible de déterminer le nom de la machine distante" +msgstr "Impossible de déterminer le nom de la machine distante" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Impossible de déterminer le nom local" +msgstr "Impossible de déterminer le nom local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Le serveur a refusé notre connexion et a répondu : %s" +msgstr "Le serveur a refusé notre connexion et a répondu : %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER incorrect, le serveur a répondu : %s" +msgstr "USER incorrect, le serveur a répondu : %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS incorrect, le serveur a répondu : %s" +msgstr "PASS incorrect, le serveur a répondu : %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" +"Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" "ftp::ProxyLogin est vide." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Échec de TYPE, le serveur a répondu : %s" +msgstr "Échec de TYPE, le serveur a répondu : %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Dépassement du délai de connexion" +msgstr "Dépassement du délai de connexion" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Le serveur a fermé la connexion" +msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erreur de lecture" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Une réponse a fait déborder le tampon." +msgstr "Une réponse a fait déborder le tampon." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "Erreur d'écriture" +msgstr "Erreur d'écriture" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Impossible de créer un connecteur" +msgstr "Impossible de créer un connecteur" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" -"Impossible de se connecter sur le port de données, délai de connexion dépassé" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1815,19 +1865,19 @@ msgstr "Impossible de se connecter au port en mode passif." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" +msgstr "gettaddrinfo n'a pu obtenir un port d'écoute" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Impossible de se connecter à un port" +msgstr "Impossible de se connecter à un port" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Impossible d'écouter sur le port" +msgstr "Impossible d'écouter sur le port" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Impossible de déterminer le nom du port" +msgstr "Impossible de déterminer le nom du port" #: methods/ftp.cc:779 msgid "Unable to send PORT command" @@ -1841,996 +1891,1082 @@ msgstr "Famille d'adresses %u inconnue (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT a échoué, le serveur a répondu : %s" +msgstr "EPRT a échoué, le serveur a répondu : %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Délai de connexion au port de données dépassé" +msgstr "Délai de connexion au port de données dépassé" #: methods/ftp.cc:825 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:957 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" +msgstr "Problème de hachage du fichier" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" +msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Pas de réponse du port données dans les délais" +msgstr "Pas de réponse du port données dans les délais" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" +msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Requête" +msgstr "Requête" #: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Impossible d'invoquer " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Connexion à %s (%s)" +msgstr "Connexion à %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" -msgstr "[IP : %s %s]" +msgstr "[IP : %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)" +msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." +msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé" +msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Connexion à %s: %s (%s) impossible." +msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Connexion à %s" +msgstr "Connexion à %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Ne parvient pas à résoudre « %s »" +msgstr "Ne parvient pas à résoudre « %s »" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Erreur temporaire de résolution de « %s »" +msgstr "Erreur temporaire de résolution de « %s »" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%" -"s » (%i)" +"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%" +"s » (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Impossible de se connecter à %s %s :" +msgstr "Impossible de se connecter à %s %s :" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Impossible d'accéder au porte-clés : « %s »" +msgstr "Impossible d'accéder au porte-clés : « %s »" -#: methods/gpgv.cc:100 +#: 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." +"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:204 +#: 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é." +"Erreur interne : signature correcte, mais il est impossible de déterminer " +"l'empreinte de la clé." -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Au moins une signature non valable a été rencontrée." +msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +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 gnupg est installé)." +"Impossible d'exécuter « %s » pour contrôler la signature\n" +"(veuillez vérifier si gpgv est installé)." -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "Erreur inconnue à l'exécution de gpgv" +msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "Les signatures suivantes ne sont pas valables :\n" +msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " -"n'est pas disponible :\n" +"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " +"n'est pas disponible :\n" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Ne parvient pas à ouvrir le tube pour %s" +msgstr "Ne parvient pas à ouvrir le tube pour %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Attente des fichiers d'en-tête" +msgstr "Attente des fichiers d'en-tête" -#: methods/http.cc:521 +#: 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" +msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" -msgstr "Mauvaise ligne d'en-tête" +msgstr "Mauvaise ligne d'en-tête" -#: methods/http.cc:548 methods/http.cc:555 +#: 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" +msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" -#: methods/http.cc:584 +#: 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" +msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/http.cc:599 +#: 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" +msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Ce serveur http possède un support des limites non-valide" +msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" -msgstr "Sélection défaillante" +msgstr "Sélection défaillante" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" -msgstr "Délai de connexion dépassé" +msgstr "Délai de connexion dépassé" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Erreur d'écriture du fichier de sortie" +msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Erreur d'écriture sur un fichier" +msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Erreur d'écriture sur le fichier" +msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:873 +#: 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" +msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1106 +#: 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:1105 msgid "Bad header data" -msgstr "Mauvais en-tête de donnée" +msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Échec de la connexion" +msgstr "Échec de la connexion" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Erreur interne" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Impossible de mapper un fichier vide en mémoire" +msgstr "Impossible de mapper un fichier vide en mémoire" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" +msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "La sélection %s n'a pu être trouvée" +msgstr "La sélection %s n'a pu être trouvée" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Type d'abréviation non reconnue : « %c »" +msgstr "Type d'abréviation non reconnue : « %c »" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "La ligne %d est trop longue (maxi %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." +msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erreur syntaxique %s:%u : balise mal formée" +msgstr "Erreur syntaxique %s:%u : balise mal formée" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" +msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au " +"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au " "niveau le plus haut" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" +msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" +msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" +msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier" +msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... Erreur !" +msgstr "%c%s... Erreur !" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fait" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue." +msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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'option %s de la ligne de commande n'est pas reconnue" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne" +msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "L'option %s nécessite un argument." +msgstr "L'option %s nécessite un argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Option %s : l'item configuration doit être spécifiée avec un =." +msgstr "Option %s : l'item configuration doit être spécifiée avec un =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "L'option %s prend un nombre entier en argument, et non « %s »" +msgstr "L'option %s prend un nombre entier en argument, et non « %s »" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "L'option « %s » est trop longue" +msgstr "L'option « %s » est trop longue" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "L'opération %s n'est pas valable" +msgstr "L'opération %s n'est pas valable" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Impossible d'accéder à %s" +msgstr "Impossible d'accéder à %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Impossible d'accéder au cédérom." +msgstr "Impossible d'accéder au cédérom." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Verrou non utilisé pour le fichier %s en lecture seule" +msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" +msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "A attendu %s mais il n'était pas présent" +msgstr "A attendu %s mais il n'était pas présent" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Le sous-processus %s a commis une violation d'accès mémoire" +msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" +msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Le sous-processus %s s'est arrêté prématurément" +msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "lu(s), %lu restant à lire, mais rien n'est disponible" +msgstr "lu(s), %lu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" +msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "Problème de fermeture du fichier" +msgstr "Problème de fermeture du fichier" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Problème d'effacement du fichier" +msgstr "Problème d'effacement du fichier" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "Problème de synchronisation du fichier" +msgstr "Problème de synchronisation du fichier" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache des paquets vide" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Le fichier de cache des paquets est corrompu" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Cet APT ne supporte pas le système de version « %s »" +msgstr "Cet APT ne supporte pas le système de version « %s »" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Le cache des paquets a été construit pour une architecture différente" +msgstr "Le cache des paquets a été construit pour une architecture différente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "Dépend" +msgstr "Dépend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Pré-Dépend" +msgstr "Pré-Dépend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" -msgstr "Suggère" +msgstr "Suggère" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "Rend obsolète" +msgstr "Rend obsolète" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Casse" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" -msgstr "nécessaire" +msgstr "nécessaire" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" -msgstr "supplémentaire" +msgstr "supplémentaire" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Construction de l'arbre des dépendances" +msgstr "Construction de l'arbre des dépendances" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" -msgstr "Génération des dépendances" +msgstr "Génération des dépendances" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Lecture des informations d'état" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Impossible d'ouvrir le fichier d'état %s" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Erreur d'écriture du fichier d'état temporaire %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" +msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" +msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" +msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" +"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" +"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Ligne %u mal formée dans la liste des sources %s (type)" +msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "" -"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"Cette installation va temporairement nécessiter l'enlèvement du paquet " +"Cette installation va temporairement nécessiter l'enlèvement du paquet " "essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-" -"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " +"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " "le faire, activez l'option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Le type de fichier d'index « %s » n'est pas accepté" +msgstr "Le type de fichier d'index « %s » n'est pas accepté" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " +"Le paquet %s doit être réinstallé, mais il est impossible de trouver son " "archive." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être " -"causé par les paquets devant être gardés en l'état." +"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être " +"causé par les paquets devant être gardés en l'état." -#: apt-pkg/algorithms.cc:1061 +#: 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 " -"« garder en l'état »." +"Impossible de corriger les problèmes, des paquets défectueux sont en mode " +"« garder en l'état »." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Le téléchargement de quelques fichiers d'index a échoué, ils ont été " +"ignorés, ou les anciens ont été utilisés à la place." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." -msgstr "Le répertoire %spartial pour les listes n'existe pas." +msgstr "Le répertoire %spartial pour les listes n'existe pas." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Le répertoire d'archive %spartial n'existe pas." +msgstr "Le répertoire d'archive %spartial n'existe pas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Téléchargement du fichier %li de %li (%s restant)" +msgstr "Téléchargement du fichier %li sur %li (%s restant)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "Téléchargement du fichier %li de %li" +msgstr "Téléchargement du fichier %li sur %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "Le pilote pour la méthode %s n'a pu être trouvé." +msgstr "Le pilote pour la méthode %s n'a pu être trouvé." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "La méthode %s n'a pas démarré correctement" +msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " -"touche Entrée." +"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " +"touche Entrée." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Le système de paquet « %s » n'est pas supporté" +msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Impossible de déterminer un type du système de paquets adéquat" +msgstr "Impossible de déterminer un type du système de paquets adéquat" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossible de localiser %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Vous devez insérer quelques adresses « sources » dans votre sources.list" +"Vous devez insérer quelques adresses « sources » dans votre sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou " +"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou " "lus." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." +msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -"Enregistrement invalide dans votre fichier « préférences », aucune entrée " -"« Package »." +"Enregistrement invalide dans votre fichier « préférences », aucune entrée " +"« Package »." -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Étiquette %s inconnue" +msgstr "Étiquette %s inconnue" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" +msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Le cache possède un système de version incompatible" +msgstr "Le cache possède un système de version incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Erreur apparue lors du traitement de %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Vous avez dépassé le nombre de noms de paquets que cet APT est capable de " -"traiter." +"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est " +"capable de traiter." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Vous avez dépassé le nombre de versions que cet APT est capable de traiter." +"Vous avez dépassé le nombre de versions que cette version d'APT est capable " +"de traiter." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Vous avez dépassé le nombre de descriptions que cette version d'APT est " +"capable de traiter." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Vous avez dépassé le nombre de dépendances que cet APT est capable de " -"traiter." +"Vous avez dépassé le nombre de dépendances que cette version d'APT est " +"capable de traiter." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " +"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Assemblage des fichiers listés dans les champs Provides" +msgstr "Assemblage des fichiers listés dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "Somme de contrôle MD5 incohérente" +msgstr "Somme de contrôle MD5 incohérente" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: 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" +"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"sans doute que vous devrez corriger ce paquet manuellement (absence " -"d'architecture)." +"Impossible de localiser un fichier du paquet %s. Cela signifie que vous " +"devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " -"que vous devrez corriger manuellement ce paquet." +"Impossible de localiser un fichier du paquet %s. Cela signifie que vous " +"devrez corriger ce paquet vous-même." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " +"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "Taille incohérente" +msgstr "Taille incohérente" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Utilisation du point de montage %s pour le cédérom\n" -"Montage du cédérom\n" +"Utilisation du point de montage %s pour le cédérom\n" +"Montage du cédérom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identification..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "Étiquette stockée : %s\n" +msgid "Stored label: %s\n" +msgstr "Étiquette stockée : %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Démontage du cédérom...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Utilisation du point de montage %s pour le cédérom\n" +msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" -msgstr "Démontage du cédérom\n" +msgstr "Démontage du cédérom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" -msgstr "Montage du cédérom...\n" +msgstr "Montage du cédérom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Examen du disque à la recherche de fichiers d'index...\n" +msgstr "Examen du disque à la recherche de fichiers d'index...\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 index de paquets trouvés, %zu index de sources, %zu index de traductions " +"et %zu signatures\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i index de paquets trouvés, %i index de sources et %i signatures\n" +msgid "Found label '%s'\n" +msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Ce disque s'appelle :\n" -"« %s »\n" +"Ce disque s'appelle :\n" +"« %s »\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "Écriture de la nouvelle liste de sources\n" +msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "Les entrées de listes de sources pour ce disque sont :\n" - -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Démontage du cédérom..." +msgstr "Les entrées de listes de sources pour ce disque sont :\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" -msgstr "%i enregistrements écrits.\n" +msgstr "%i enregistrements écrits.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" +msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" +msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 enregistrements écrits avec %i fichiers manquants et %i qui ne " +"%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installation de %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Configuration de %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Suppression de %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Exécution des actions différées (« trigger ») de %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Répertoire %s inexistant" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "Préparation de %s" +msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" -msgstr "Décompression de %s" +msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Préparation de la configuration de %s" +msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Configuration de %s" +msgid "Processing triggers for %s" +msgstr "Traitement des déclencheurs (« triggers ») pour %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "%s installé" +msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Préparation de la suppression de %s" +msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Suppression de %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "%s supprimé" +msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "Préparation de la suppression complète de %s" +msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "%s complètement supprimé" +msgstr "%s complètement supprimé" + +#: 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" #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "Impossible de modifier (« patch ») %s" +msgstr "Impossible de corriger le fichier" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Connexion fermée prématurément" +msgstr "Connexion fermée prématurément" -#~ msgid "File date has changed %s" -#~ msgstr "La date du fichier a changé %s" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "La zone dynamique d'allocation mémoire n'a plus de place" diff --git a/po/gl.po b/po/gl.po index ee80fa7..9650168 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,160 +1,172 @@ +# translation of apt_po_gl.po to galician # Galician translation of apt # This file is put in the public domain. -# Jacobo Tarrío , 2005. # +# 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: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-07 11:48+0200\n" -"Last-Translator: Jacobo Tarrío \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\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:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Non se puido atopar o paquete %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Número total de nomes de paquetes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquetes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquetes virtuais puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquetes virtuais simples: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquetes virtuais mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Non atopados: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Número total de versións distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Número total de descricións distintas: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Número total de dependencias: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Número total de relacións versión/ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Número total de relacións descrición/ficheiro: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Número total de mapas de Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Número total de cadeas: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Espazo total de versións de dependencias: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Espazo de reserva total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Debe fornecer exactamente un patrón" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" -msgstr "[%4i] %s\n" +msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(non se atopou)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ningún)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s para %s %s compilado en %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s para %s compilado o %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +189,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -214,7 +226,7 @@ msgstr "" " depends - Amosa a información bruta de dependencias dun paquete\n" " rdepends - Amosa información de dependencias inversas dun paquete\n" " pkgnames - Amosa os nomes de tódolos paquetes\n" -" dotty - Xera gráficas de paquetes para GraphVis\n" +" dotty - Xera gráficas de paquetes para GraphViz\n" " xvcg - Xera gráficas de paquetes para xvcg\n" " policy - Amosa a configuración de normativa\n" "\n" @@ -225,7 +237,7 @@ msgstr "" " -q Desactiva o indicador de progreso.\n" " -i Amosa só as dependencias importantes na orde unmet.\n" " -c=? Le este ficheiro de configuración.\n" -" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" "Vexa as páxinas de manual de apt-cache(8) e apt.conf(5) para máis " "información.\n" @@ -272,7 +284,7 @@ msgstr "" "Opcións:\n" " -h Este texto de axuda.\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" #: cmdline/apt-extracttemplates.cc:98 @@ -300,12 +312,12 @@ msgstr "" "\n" "Opcións:\n" " -h Este texto de axuda\n" -" -t Estabrece o directorio temporal\n" +" -t Establece o directorio temporal\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Non se puido escribir en %s" @@ -314,31 +326,31 @@ msgstr "Non se puido escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non se puido obter a versión de debconf. ¿Debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "A lista de extensións de paquetes é longa de máis" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Erro ao procesar o directorio %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "A lista de extensións de fontes é longa de máis" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erro ao gravar a cabeceira no ficheiro de contido" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erro ao procesar o contido %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -421,29 +433,29 @@ msgstr "" " --no-delink Activa o modo de depuración de desligado\n" " --contents Controla a xeración do ficheiro de contido\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Estabrece unha opción de configuración" +" -o=? Establece unha opción de configuración" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ningunha selección encaixou" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" "A base de datos estaba corrompida, cambiouse o nome do ficheiro a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, trátase de actualizar %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -451,278 +463,278 @@ msgstr "" "O formato da base de datos non é válido. Se actualizou desde unha versión " "antiga de apt, elimine e volva crear a base de datos." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Non se atopou %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Non se puido obter un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Non se puido ler o directorio %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Non se atopou %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Os erros aplícanse ao ficheiro " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Non se puido resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "O percorrido da árbore fallou" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Non se puido abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DesLig %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Non se puido ler a ligazón %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Non se puido borrar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Non se puido ligar %s con %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de \"override\" de código fonte\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro interno, non se puido atopar o membro %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Non se puido reservar memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Non se puido abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "\"Override\" %s liña %lu mal formado (1)" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "\"Override\" %s liña %lu mal formado (2)" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "\"Override\" %s liña %lu mal formado (3)" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Non se puido ler o ficheiro de \"overrides\" %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compresión \"%s\" descoñecido" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "A saída comprimida %s precisa dun xogo de compresión" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Non se puido crear a canle IPC ao subproceso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Non se puido crear o FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Non se puido chamar a fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Fillo de compresión" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro interno, non se puido crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Non se puido crear o IPC do subproceso" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Non se puido executar o compresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "descompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "A E/S ao subproceso/ficheiro fallou" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Non se puido ler ao calcular o MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao borrar %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Non se puido cambiar o nome de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "pero hase instalar %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "pero non é instalable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "pero é un paquete virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "pero non está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "pero non se ha instalar" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Os seguintes paquetes hanse ELIMINAR:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Os seguintes paquetes consérvanse:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Os seguintes paquetes hanse actualizar:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Os seguintes paquetes hanse DESACTUALIZAR:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Os seguintes paquetes retidos hanse modificar:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (debido a %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -730,144 +742,144 @@ msgstr "" "AVISO: Hanse eliminar os seguintes paquetes esenciais.\n" "¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu hanse eliminar e %lu sen actualizar.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou eliminados de todo.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "A corrixir as dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Non se puido corrixir as dependencias." -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Non se puido minimizar o xogo de actualizacións" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Rematado" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estes paquetes sen verificación [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Houbo problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Non se puido ler a lista de orixes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que recibir %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Despois desta operación hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre de abondo en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +890,28 @@ msgstr "" "Para continuar escriba a frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,49 +919,49 @@ msgstr "" "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está " "soportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,75 +972,120 @@ msgstr "" "Isto pode significar que o paquete falla, está obsoleto ou só está\n" "dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Non se supón que se deban eliminar cousas; non se pode iniciar o " +"autoeliminador" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Non se puido descargar algúns ficheiros de índices; ignoráronse ou " -"empregáronse uns vellos no seu lugar." +"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Empregue \"apt-get autoremove\" para eliminalos." + +#: 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 "" +"Hum, semella que o autoeliminadir destruiu algo, o que non debería\n" +"ter ocorrido. Envíe un informe de erro sobre 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 "A seguinte información pode axudar a resolver a situación:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro interno, o autoeliminador rompeu cousas" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Non se puido atopar a tarefa %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s cambiouse a instalado manualmente.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1093,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1047,131 +1104,118 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1569 -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." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A seguinte información pode axudar a resolver a situación:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1180,7 +1224,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1189,32 +1233,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1229,6 +1273,8 @@ msgid "" " 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" @@ -1244,7 +1290,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1264,37 +1310,40 @@ msgstr "" "\".\n" "\n" "Ordes:\n" -" update - Descarga as novas listas de paquetes\n" +" update - Descarga novas listas de paquetes\n" " upgrade - Realiza unha actualización\n" " install - Instala novos paquetes (o paquete chámase libc6, non libc6." "deb)\n" " remove - Elimina paquetes\n" +" autoremove - Elimina automaticamente os paquetes non usados\n" +" purge - Elimina e purga paquetes\n" " source - Descarga arquivos de código fonte\n" " build-dep - Configura as dependencias de compilación dos paquetes fonte\n" -" dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n" -" dselect-upgrade - Sigue as seleccións de dselect\n" +" dist-upgrade - Actualiza a distribución, consulte apt-get(8)\n" +" dselect-upgrade - Segue as seleccións de dselect\n" " clean - Borra os arquivos descargados\n" -" autoclean - Borra os arquivos antigos descargados\n" -" check - Verifica que non hai dependencias rotas\n" +" autoclean - Borra os arquivos descargados antigos\n" +" check - Comproba que non haxa dependencias rotas\n" "\n" "Opcións:\n" " -h Este texto de axuda.\n" " -q Saída que se pode rexistrar - sen indicador de progreso\n" -" -qq Sen saída agás os erros\n" +" -qq Sen saída agás polos erros\n" " -d Só descarga - NON instala nin desempaqueta os arquivos\n" -" -s No-act. Realiza unha simulación de ordeamento\n" -" -y Supón \"Sí\" a tódalas preguntas e non as amosa\n" -" -f Tenta continuar se a comprobación de integridade falla\n" +" -s Non actuar. Realiza unha simulación de ordeamento\n" +" -y Supón unha resposta afirmativa a tódalas preguntas sen amosalas\n" +" -f Tenta corrixir un sistema con dependencias rotas\n" " -m Tenta continuar se non se poden localizar os arquivos\n" " -u Tamén amosa unha lista de paquetes actualizados\n" -" -b Constrúe o paquete fonte despois de o descargar\n" -" -V Amosa números detallados de versión\n" +" -b Compila o paquete fonte despois de o descargar\n" +" -V Amosa números de versión detallados\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" +" -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -"Vexa as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) para\n" -"ver máis información e opcións.\n" -" Este APT ten Poderes de Super Vaca.\n" +"Consulte as páxinas de manual apt-get(8), sources.list(5) e apt.conf(5) " +"para\n" +"máis información e opcións.\n" +" Este APT ten Poderes de Supervaca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1359,31 +1408,35 @@ msgstr "" " -h Este texto de axuda\n" " -s Emprega ordeamento por ficheiros fonte\n" " -c=? Le este ficheiro de configuración\n" -" -o=? Estabrece unha opción de configuración; por exemplo, -o dir::cache=/" +" -o=? Establece unha opción de configuración; por exemplo, -o dir::cache=/" "tmp\n" #: dselect/install:32 msgid "Bad default setting!" msgstr "¡Configuración por defecto incorrecta!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Prema Intro para continuar." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "¿Quere borrar os ficheiros .deb descargados anteriormente?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Houbo algúns erros ao desempaquetar. Vanse configurar os paquetes" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "que se instalaron. Isto pode producir erros duplicados ou erros" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "causados por dependencias incumpridas. Isto é normal, só os erros" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1393,189 +1446,189 @@ msgstr "" msgid "Merging available information" msgstr "A mesturar a información sobre paquetes dispoñibles" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Non se puido crear as canles" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Non se puido executar gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Sinatura de arquivo non válida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro ao ler a cabeceira do membro do arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeceira do membro do arquivo non válida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "O arquivo é curto de máis" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Non se puido ler as cabeceiras dos arquivos" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Chamouse a DropNode nun nodo aínda ligado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Non se puido atopar o elemento hash" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Non se puido reservar un desvío" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro interno en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desvío %s -> %s engadido dúas veces" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Non se puido gravar o ficheiro %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Non se puido pechar o ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "A ruta %s é longa de máis" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "A desempaquetar %s máis dunha vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "O directorio %s está desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O paquete tenta gravar no destino do desvío %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "A ruta do desvío é longa de máis" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directorio %s estase a substituír por algo que non é un directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Non se puido atopar o nodo no seu caldeiro hash" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "A ruta é longa de máis" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Coincidencia na sobrescritura sen versión para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Non se pode ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Non se atopou %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Non se puido eliminar %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Non se pode crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Non se atopou %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "A ler as listas de paquetes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Non se puido cambiar ao directorio de administración %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Erro interno ao obter un nome de paquete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "A ler a lista de ficheiros" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1585,77 +1638,78 @@ msgstr "" "Non se puido abrir o ficheiro de listas \"%sinfo/%s\". Se non pode " "recuperalo, baléireo e reinstale a mesma versión do paquete." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Non se puido ler o ficheiro de listas %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Erro interno ao obter un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Non se puido abrir o ficheiro de desvíos %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O ficheiro de desvíos está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Liña non válida no ficheiro de desvíos: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erro interno ao engadir un desvío" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Ten que se inicializar a caché de paquetes primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Non se puido atopar unha cabeceira Package:, desprazamento %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erro ao analizar o MD5. Desprazamento %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Este non é un arquivo DEB válido, falla o membro \"%s\"" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\"" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Este non é un arquivo DEB válido, non ten un membro \"%s\", \"%s\" ou \"%s\"" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Non se puido cambiar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Erro interno, non se puido atopar un membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Non se puido atopar un ficheiro de control válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Ficheiro de control non analizable" @@ -1676,26 +1730,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM incorrecto" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Non se atopou" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1757,7 +1810,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1769,7 +1822,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -1824,7 +1877,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1851,59 +1904,59 @@ msgstr "Petición" msgid "Unable to invoke " msgstr "Non se puido chamar a " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "A conectar a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Non se pode iniciar a conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non se puido conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "A conectar a %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Non se puido resolver \"%s\"" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal ao resolver \"%s\"" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Non se pode conectar a %s %s:" @@ -1913,38 +1966,38 @@ msgstr "Non se pode conectar a %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Non se puido acceder ao chaveiro: \"%s\"" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg " +"Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv " "instalado?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1962,428 +2015,453 @@ msgstr "Non se puido abrir unha canle para %s" msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Non se puido truncar o ficheiro" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Non se pode facer mmap sobre un ficheiro baleiro" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Non se atopou a selección %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo \"%c\" descoñecida" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Liña %d longa de máis (máximo %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído de aquí" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Erro!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Rematado" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Non se coñece a opción de liña de ordes \"%c\" [de %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Non se entende a opción de liña de ordes %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "A opción de liña de ordes %s non é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "A opción %s precisa dun argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opción %s: A especificación de elemento de configuración debe ter un =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "A opción %s precisa dun argumento enteiro, non \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "A opción \"%s\" é longa de máis" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O senso %s non se entende, probe \"true\" ou \"false\"." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operación %s non válida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Non se pode analizar o punto de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Non se pode cambiar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Caché de paquetes baleira" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de caché de paquetes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de caché de paquetes é unha versión incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT non soporta o sistema de versionamento \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A caché de paquetes construiuse para unha arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suxire" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicto con" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitúe a" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fai obsoleto a" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Rompe" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requirido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "A construír a árbore de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "A ler a información do estado" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Non se puido abrir o ficheiro de estado %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Non se puido gravar o ficheiro de estado temporal %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal formada na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal formada na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2394,19 +2472,19 @@ msgstr "" "%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, " "pero se o quere facer, active a opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "O tipo de ficheiros de índices \"%s\" non está soportado" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2414,186 +2492,210 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado " "por paquetes retidos." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Non se puido descargar algúns ficheiros de índices; ignoráronse ou " +"empregáronse uns vellos no seu lugar." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "O directorio de listas %spartial falla." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "O directorio de arquivos %spartial falla." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (fallan %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Non se puido atopar o controlador de métodos %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Non se pode analizar %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira " "Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "A caché ten un sistema de versionamento incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocorreu un erro ao procesar %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocorreu un erro ao procesar %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocorreu un erro ao procesar %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocorreu un erro ao procesar %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocorreu un erro ao procesar %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocorreu un erro ao procesar %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Guau, superou o número de versións que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Guau, superou o número de descricións que este APT pode manexar." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Guau, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocorreu un erro ao procesar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non se atopou a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "A recoller as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Os \"hashes\" non coinciden" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2602,7 +2704,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2611,7 +2713,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2619,7 +2721,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2628,7 +2730,7 @@ msgstr "Os tamaños non coinciden" msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2637,48 +2739,60 @@ msgstr "" "A empregar o punto de montaxe de CD-ROMs %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Etiqueta armacenada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A empregar o punto de montaxe de CD-ROMs %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "A agardar polo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "A buscar os ficheiros de índices no disco..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n" +"Atopáronse %zu índices de paquetes, %zu índices de fontes, %zu índices de " +"traducións e %zu sinaturas\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Atopouse a etiqueta \"%s\"\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome válido, volva tentalo.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2687,114 +2801,124 @@ msgstr "" "Este disco chámase: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "A copiar as listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "A gravar a nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de fontes deste disco son:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "A desmontar o CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Graváronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " "coinciden\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "A instalar %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "A configurar %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "A eliminar %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "A executar o disparador de post-instalación %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "O directorio \"%s\" falla" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "A desempaquetar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "A se preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "A configurar %s" +msgid "Processing triggers for %s" +msgstr "A procesar os disparadores de %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "A se preparar para a eliminación de %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "A eliminar %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Eliminouse %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "A se preparar para eliminar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Eliminouse %s completamente" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts " +"non estaba montado?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Non se puido abrir o ficheiro %s" +msgstr "Non se puido parchear o ficheiro" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" -#~ 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" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "O MMap Dinámico esgotou o espazo" diff --git a/po/he.po b/po/he.po index 48010f9..35edebd 100644 --- a/po/he.po +++ b/po/he.po @@ -1,13 +1,13 @@ # English translation of apt_po. # This file is put in the public domain. # Lior Kaplan , 2004. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "לחבילה %s בגרסה %s יש תלויות שלא נענו:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "חבילות נורמליות:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "חבילות וירטואליות לחלוטין:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "חסרות:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "קובץ החבילה %s לא מסונכרן." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "אתה חייב לתת בדיוק תבנית אחת" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "לא נמצאו חבילות" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "קבצי חבילה:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "חבילות נעוצות:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(לא נמצא)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "מותקן:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "מועמדים:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "× ×¢×¥ חבילה:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -243,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:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "לא מצליח לכתוב ל-%s" @@ -252,31 +260,31 @@ msgstr "לא מצליח לכתוב ל-%s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "לא מצליח לקבל את גרסת debconf. האם debconf מותקן?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "שגיאה בעיבוד ספריה %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -318,303 +326,303 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "אין התאמות" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: לא מצליח לקרוא את הספריה %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: שגיאות תקפות לקובץ" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "כשלון בפענוח %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "כשלון בפתיחת %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** כשלון בקישור %s ל-%s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "המתחזק של %s הוא %s ולא %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - כשלון בהקצאת זיכרון" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "לא מצליח לפתוח את %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' אלגוריתם דחיה לא ידוע" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "כשלון בביצוע fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "לחבילות הבאות יש תלויות שלא נענו:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "אבל %s מותקנת" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "אבל היא אינה ניתנת להתקנה" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "אבל היא חבילה וירטואלית" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "אבל היא לא מותקנת" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "אבל היא אינה הולכת להיות מותקנת" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr "או" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "החבילות הבאות יוסרו:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "החבילות הבאות מעובות:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "החבילות הבאות ישודרגו מטה:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "החבילות המחוזקות הבאות ישונו:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (בגלל %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:550 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -623,144 +631,144 @@ msgstr "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "מתקן תלויות..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr "כשלון." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "לא מצליח לתקן תלויות" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr "סיום" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "רשימת המקורות לא ניתנת לקריאה." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "כן, עשה כפי שאני אומר!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -768,75 +776,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "בטל." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -844,79 +852,123 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "שגיאה פנימית, כלשון ביצירת %s" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "אבל %s הולכת להיות מותקנת" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -924,164 +976,153 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: 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 "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1096,6 +1137,8 @@ msgid "" " 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" @@ -1111,7 +1154,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1179,24 +1222,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1205,188 +1252,188 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "כשלון בפענוח %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1394,77 +1441,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "" @@ -1483,27 +1530,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "(לא נמצא)" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1563,7 +1609,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1575,7 +1621,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1629,7 +1675,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1656,59 +1702,59 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@ -1718,34 +1764,34 @@ msgstr "" msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1761,427 +1807,453 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "כשלון בפענוח %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 #, c-format -msgid "Selection %s not found" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format -msgid "Unrecognized type abbreviation: '%c'" +msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Opening configuration file %s" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Line %d too long (max %d)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "כשלון בפתיחת %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "כשלון בפענוח %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2189,217 +2261,240 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: 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 "" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "" @@ -2408,146 +2503,178 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "מותקן:" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "שגיאה בעיבוד ספריה %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, fuzzy, c-format msgid "Installed %s" msgstr "מותקן:" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" @@ -2556,5 +2683,9 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "כשלון." + #~ msgid "File date has changed %s" #~ msgstr "תאריך הקובץ השתנה %s" diff --git a/po/hu.po b/po/hu.po index 20664bc..2337956 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-21 11:04+0100\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-05-11 14:49+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -19,146 +19,155 @@ msgstr "" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Az alábbi csomag nem található: %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Csomagnevek összesen : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normális csomagok: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Teljesen virtuális csomagok: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Egyedi virtuális csomagok: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Vegyes virtuális csomagok: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Hiányzik: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Különböző verziók összesen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Összes külső leírás: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Függőségek összesen: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Verzió/Fájl kapcsolatok összesen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Összes Leírás/Fájl kapcsolat: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "\"Előkészít\" kapcsolatok összesen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Minták összesen: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Függőségi-verzió terület összesen: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack terület összesen: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Terület összesen: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomag fájl szinkronon kívül." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Pontosan egy mintát kell megadnod" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nem találtam csomagokat" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nem találtam)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nincs)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Csomag Tű: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s erre: %s ekkor fordult: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -181,8 +190,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -218,7 +227,7 @@ msgstr "" " depends - Nyers függőségi információt mutat a csomagról\n" " rdepends - Fordított függőségi információkat mutat a csomagról\n" " pkgnames - Kilistázza az összes csomag nevét\n" -" dotty - GraphVishez való csomaggrafikonokat generál\n" +" dotty - GraphVizhez való csomaggrafikonokat generál\n" " xvcg - xvcg-hez való csomaggrafikonokat generál\n" " policy - Megmutatja a policy beállításokat\n" "\n" @@ -305,7 +314,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -314,31 +323,31 @@ msgstr "Nem lehet írni ebbe: %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Hiba a(z) %s könyvtár feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Hiba a tartalom fájl fejlécének írásakor" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -420,26 +429,26 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB megsérült, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -447,278 +456,278 @@ msgstr "" "DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld " "és hozd újra létre az adatbázist." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "H: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "F: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani ezt: %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Fabejárás nem sikerült" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "unlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése ehhez: %s sikertelen" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Belső hiba, %s tag nem található" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Deformált felülbírálás %s %lu. sorában #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Deformált felülbírálás %s %lu. sorában #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Deformált felülbírálás %s %lu. sorában #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nem lehet a(z)%s felülbírálófájlt olvasni" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' tömörítési algoritmus ismeretlen" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC csövet létrehozni az alfolyamathoz" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Nem sikerült FILE*-ot létrehozni" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Nem sikerült forkolni" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Gyermekfolyamat tömörítése" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "kicsomagoló" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s elláncolásakor" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Nem sikerült átnevezni %s-t erre: %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " vagy" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -726,143 +735,143 @@ msgstr "" "FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n" "NE tedd ezt, míg nem tudod pontosan, mit csinálsz!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu kerül öregbítésre, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetést átléptem.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "A források listája olvashatatlan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő az archívumokból: %sB/%sB\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltés az archívumokból: %sB\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "E művelet után további %sB lemez-területetet használok fel.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "E művelet után %sB lemez-terület szabadul fel.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +882,28 @@ msgstr "" "A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,47 +911,47 @@ msgstr "" "Nem lehet letölteni néhány archívumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,75 +961,117 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá\n" ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nincs törölnivaló, az AutoRemover nem indítható" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Töröld az 'apt-get autoremove' paranccsal!" + +#: 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 "" -"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " -"változatukat használom." +"Hm, az AutoRemover hibát okozott, ez nagy gáz!\n" +"Kérjük, küldj hiba-jegyet az apt csomagra!" + +#. +#. 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 "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Belső hiba, az AutoRemover sérült" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Hiányzó %s feladat" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s kézi telepítésre állított.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1079,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1040,132 +1091,118 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1569 -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 "" -"Mivel csak egyetlen műveletet kértél, ez nagy valószínűséggel arra utal\n" -"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" -"kitölteni a csomaghoz." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Az alábbi információ segíthet megoldani a helyzetet:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1174,7 +1211,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1183,32 +1220,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1223,6 +1260,8 @@ msgid "" " 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" @@ -1238,7 +1277,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1262,6 +1301,8 @@ msgstr "" " upgrade - Végrehajt egy frissítést\n" " install - Új csomagokat telepít (csomag a libc6 és nem a libc6.deb)\n" " remove - Csomagokat távolít el\n" +" autoremove - Automatikusan eltávolítja a nem-használt csomagokat\n" +" purge - Eltávolít és teljesen töröl csomagokat\n" " source - Forrás archívumokat tölt le\n" " build-dep - Forráscsomagok építési-függőségét konfigurálja\n" " dist-upgrade - Disztribúció frissítés, lásd apt-get(8)\n" @@ -1281,9 +1322,10 @@ msgstr "" " -m Próbáld folytatni, akkor is ha egyes archívumok nem találhatók\n" " -u Mutat egy listát a frissített csomagokról is\n" " -b Megépíti a forráscsomagot miután letöltötte\n" +" -V Bőbeszédű verzió számok\n" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -"Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat\n" +"Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyv-lapokat\n" "további információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" @@ -1356,24 +1398,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Hibás alapértelmezett beállítás!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Üss entert a folytatáshoz." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Törlöd a korábban letöltött .deb fájlokat?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Néhány hiba adódott kibontás közben. Nekilátok konfigurálni a" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "már telepített csomagokat. Ez a hibák duplázódását eredményezheti" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "vagy hiányzó függőségek miatti hibákat. Ez így OK, csak az ezen üzenet" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra" @@ -1382,188 +1428,188 @@ msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra msgid "Merging available information" msgstr "Elérhető információk egyesítése" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Nem sikerült csöveket létrehozni" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Érvénytelen archívum-aláírás" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Hiba az archívum tag fejléc olvasásakor" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Érvénytelen archívum tag fejléc" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Az archívum túl rövid" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Nem sikerült olvasni az archívum fejléceket" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode hívása egy még mindig láncolt node-ra történt" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "A hash elem nem található!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nem lehet eltérítést lefoglalni" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Belső hiba az AddDiversion-ban" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Megpróbálom felülírni %s -> %s és %s/%s eltérítést" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "%s fájl írása sikertelen" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Nem sikerült a(z) %s fájlt bezárni" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "A(z) %s útvonal túl hosszú" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s egynél többszöri kicsomagolása" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "A(z) %s könyvtár eltérítve" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Az eltérített útvonal túl hosszú" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nem sikerült a node helyét megtalálni a hash-ében" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Az útvonal túl hosszú" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Csomagtalálat felülírása %s verziója nélkül" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 nem olvasható" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s nem érhető el" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s eltávolítása sikertelen" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s létrehozása sikertelen" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo nem érhető el" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Csomaglisták olvasása" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Belső hiba a csomagnév elhozásakor" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Fájllista olvasása" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1574,77 +1620,77 @@ msgstr "" "ezt a fájlt, akkor ürítsd ki, és azonnal telepítsd újra a csomag ugyanezen " "verzióját!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Nem sikerült a(z) %sinfo/%s lista fájlt olvasni" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Belső hiba a Node kinyerésekor" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Nem sikerült a(z) %sdiversions eltérítő fájlt megnyitni" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Az eltérítő fájl hibás" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Érvénytelen sor az eltérítő fájlban: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Belső hiba egy eltérítés hozzáadásakor" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "A csomag gyorstárnak előbb kell inicializálva lennie" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Nem találom a csomag-fejlécet, offszet %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 értelmezési hiba. Offszet %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Érvénytelen DEB archívum, nincs '%s', '%s' vagy '%s' tagja" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Nem lehet váltani ebbe: %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Belső hiba, a tag nem található" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Nem található érvényes vezérlő fájl" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Értelmezhetetlen vezérlő fájl" @@ -1665,26 +1711,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Hibás CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Nem találom a lemezt" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nem találom a fájlt" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Nem érhető el" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1746,7 +1791,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1758,7 +1803,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -1812,7 +1857,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1839,59 +1884,59 @@ msgstr "Lekérdezés" msgid "Unable to invoke " msgstr "Nem lehet meghívni " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Csatlakozás: %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" @@ -1901,33 +1946,33 @@ msgstr "Sikertelen kapcsolódás ide: %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "%s kulcstartó nem érhető el" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gnupg telepítve van?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1944,429 +1989,455 @@ msgstr "Nem lehet csövet nyitni ehhez: %s" msgid "Read error from %s process" msgstr "Olvasási hiba %s folyamattól" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "%s fájl írása sikertelen" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Belső hiba" # FIXME -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "%s kiválasztás nem található" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "A(z) %d. sor túl hosszú (maximum %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Hiba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Kész" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "A(z) '%c' parancssori opció [a következőből: %s] ismeretlen." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 parancssori opció értelmezhetetlen" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "%s parancssori opció nem logikai" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s opcióhoz szükséges egy argumentum" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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 opció: a konfigurációs elem specifikációhoz szükséges egy =<érték> rész." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s opció egész és nem %s típusú argumentumot követel meg" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Túl hosszú %s opció" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s jelentés nem értelmezhető, próbáld a true vagy false értékeket" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "%s érvénytelen művelet" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Nem sikerült ide váltani: %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Üres csomag-gyorstár" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "A csomag-gyorstár fájl megsérült" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "A csomag-gyorstár fájl inkompatibilis verziójú" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A csomag-gyorstár egy másik architektúrához készült" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Függ ettől" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Függ ettől (előfüggés)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Javasolja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Ajánlja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ütközik" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Kicseréli" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Elavulttá teszi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Töri" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "fontos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "szükséges" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "szabványos" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionális" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Függőségi fa építése" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Lehetséges verziók" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Függőség-generálás" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Állapot adatok olvasása" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "%s állapot-fájl megnyitása sikertelen" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s átmeneti állapot-fájl írása sikertelen" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2377,19 +2448,19 @@ msgstr "" "alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, " "de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "A(z) '%s' indexfájltípus nem támogatott" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2397,188 +2468,213 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " +"változatukat használom." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial listakönyvtár hiányzik." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li/%li fájl letöltése (%s marad)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "%li/%li fájl letöltése" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "A(z) %s metódus vezérlő nem található." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típus nem határozható meg" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s nem érhető el." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s tűtípus nem értelmezhető" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba történt %s feldolgozásakor (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba történt %s feldolgozásakor (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba történt %s feldolgozásakor (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba történt %s feldolgozásakor (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni tud!" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba történt %s feldolgozásakor (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "A Hash Sum nem megfelelő" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2587,7 +2683,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2596,14 +2692,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2612,7 +2708,7 @@ msgstr "A méret nem megfelelő" msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztő blokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2621,47 +2717,60 @@ msgstr "" "%s CD-ROM csatolási pont használata\n" "CD-ROM csatolása\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Azonosítás.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Tárolt címke: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM leválasztása...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM felcsatolása...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"%zu csomag-indexet, %zu forrás-indexet, %zu fordítás-indexet és %zu aláírást " +"találtam\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" +msgid "Found label '%s'\n" +msgstr "Talált címke: '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "E név érvénytelen, próbáld újra.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2670,92 +2779,113 @@ msgstr "" "E lemez neve: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM leválasztása..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i hibásan párosított fájllal\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Telepített %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s konfigurálása" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s eltávolítása" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Hiányzik ez a könyvtár: %s" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "%s konfigurálása" +msgid "Processing triggers for %s" +msgstr "Indítók feldolgozása ehhez: %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Telepített %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s eltávolítása" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Eltávolított %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolítása előkészítése" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "%s fájl foltozása sikertelen" @@ -2764,31 +2894,53 @@ msgstr "%s fájl foltozása sikertelen" msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" -#~ msgid "File date has changed %s" -#~ msgstr "A fájl dátuma megváltozott %s" - -#~ msgid "Total Distinct Descriptions: " -#~ msgstr "Összes külső leírás: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "Összes Leírás/Fájl kapcsolat: " +#~ 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 "" +#~ "Mivel csak egyetlen műveletet kértél, ez nagy valószínűséggel arra utal\n" +#~ "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" +#~ "kitölteni a csomaghoz." -#~ msgid "Reading file list" -#~ msgstr "Fájllista olvasása" +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "A(z) %d. sor túl hosszú (maximum %d)" -#~ msgid "Could not execute " -#~ msgstr "Nem futtatható" +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "A(z) %d. sor túl hosszú (maximum %d)" +#, fuzzy #~ msgid "Error occured while processing %s (NewFileDesc1)" #~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" +#, fuzzy #~ msgid "Error occured while processing %s (NewFileDesc2)" #~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." -#~ msgstr "" -#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni " -#~ "tud!" +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Tárolt címke: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Sikertelen kiválasztás" + +#~ msgid "File date has changed %s" +#~ msgstr "A fájl dátuma megváltozott %s" + +#~ msgid "Reading file list" +#~ msgstr "Fájllista olvasása" + +#~ msgid "Could not execute " +#~ msgstr "Nem futtatható" #~ msgid "Preparing for remove with config %s" #~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával" diff --git a/po/it.po b/po/it.po index 7a45dd5..c503cf0 100644 --- a/po/it.po +++ b/po/it.po @@ -1,158 +1,166 @@ # Advanced Package Transfer - APT message translation catalog # Samuele Giovanni Tonon , 2002. -# +# msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-12 09:27+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-14 12:19+0100\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Il pacchetto %s, versione %s, ha una dipendenza non soddisfatta:\n" +msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Totale nomi dei pacchetti : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Totale nomi dei pacchetti: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pacchetti normali: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pacchetti virtuali puri: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pacchetti virtuali singoli: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pacchetti virtuali misti: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Mancante: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totale versioni distinte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Totale descrizioni distinte: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totale dipendenze: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totale relazioni ver/file: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Totale relazioni Desc/File: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totale corrispondenze fornite: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totale stringhe globalizzate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Totale spazio di dipendenza di versione: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totale spazio \"slack\": " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Totale spazio occupato: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: 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." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Bisogna specificare un singolo pattern" +msgstr "Bisogna specificare unicamente un pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pacchetti con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(non trovato)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nessuno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pin del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s per %s %s compilato il %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s per %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -175,8 +183,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -212,8 +220,8 @@ msgstr "" " depends - Mostra informazioni di dipendenza per un pacchetto\n" " rdepends - Mostra informazioni di dipendenza all'incontrario per un " "pacchetto\n" -" pkgnames - Elenca i nomi di tutti i pacchetti\n" -" dotty - Genera un grafo dei pacchetti per GraphVis\n" +" pkgnames - Elenca i nomi di tutti i pacchetti nel sistema\n" +" dotty - Genera un grafo dei pacchetti per GraphViz\n" " xvcg - Genera un grafo dei pacchetti per xvcg\n" " policy - Mostra le preferenze adottate\n" "\n" @@ -302,7 +310,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -311,31 +319,31 @@ msgstr "Impossibile scrivere in %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare una versione di debconf. Debconf è installato?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "L'estensione del pacchetto è troppo lunga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "L'estensione del sorgente è troppo lunga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'header nel file contents" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'analisi dei contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +425,26 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" -#: ftparchive/apt-ftparchive.cc:835 +#: 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'" -#: ftparchive/cachedb.cc:47 +#: 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" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il DB è vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -444,278 +452,278 @@ msgstr "" "Il formato DB non è valido. Se avete aggiornato da una vecchia versione di " "apt,rimuovete e ricreate il database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "L'archivio non ha un campo control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossibile leggere la directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossibile analizzare %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Errori applicati al file " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Impossibile risolvere %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Visita dell'albero fallita" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Impossibile eseguire readlink su %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Impossibile eseguire unlink su %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossibile eseguire link tra %s e %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: 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" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ha un campo source override\n" -#: ftparchive/writer.cc:627 +#: 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" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Errore interno, impossibile trovare il campo %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Impossibile allocare memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Override malformato %s linea %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Override malformato %s linea %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Override malformato %s linea %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: 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" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo di compressione '%s' sconosciuto" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'output compresso %s necessita di un insieme di compressione" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: 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" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Impossibile creare FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Impossibile eseguire fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Sottoprocesso compresso" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Errore interno, impossibile creare %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Impossibile creare un sottoprocesso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Impossibile eseguire compressor" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompressore" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file fallito" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Impossibile leggere durante l'elaborazione MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossibile rinominare %s in %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ma %s è installato" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ma %s sta per essere installato" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ma non è installabile" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ma non è installato" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " oppure" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -724,149 +732,149 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi (downgraded), " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " fallita." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:664 +#: 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." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato \n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Non è stato possibile autenticare alcuni pacchetti" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!" -#: cmdline/apt-get.cc:764 +#: 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." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è terminato" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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." -#: cmdline/apt-get.cc:816 +#: 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" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "È necessario prendere %sB/%sB di archivi. \n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "È necessario prendere %sB di archivi. \n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Dopo l'estrazione, verranno liberati %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:846 cmdline/apt-get.cc:1989 +#: 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" -#: cmdline/apt-get.cc:849 +#: 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." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: 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" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +885,28 @@ msgstr "" "Per continuare scrivere la frase '%s' \n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: 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" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,49 +914,49 @@ msgstr "" "Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update " "o provare l'opzione --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non è ancora supportato" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." -#: cmdline/apt-get.cc:1030 +#: 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" -#: cmdline/apt-get.cc:1040 +#: 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" -#: cmdline/apt-get.cc:1058 +#: 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" -#: cmdline/apt-get.cc:1069 +#: 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" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,76 +967,121 @@ msgstr "" "pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n" "o è disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "Comunque il seguente pacchetto lo sostituisce:" +msgstr "Tuttavia questi pacchetti lo sostituiscono:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" -#: cmdline/apt-get.cc:1133 +#: 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" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s è già alla versione più recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non è stata trovata la release '%s' per '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non è stata trovata la versione '%s' per '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1384 +#: 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" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " -"si useranno quelli precedenti." +"I seguenti pacchetti erano stati automaticamente installati e non sono più " +"richiesti:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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." + +#. +#. 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 "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" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +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" -#: cmdline/apt-get.cc:1516 +#: 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" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s impostato per 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:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1089,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1048,131 +1101,117 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1569 -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." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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" -#: cmdline/apt-get.cc:1894 +#: 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" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si è saltato il file già scaricato '%s'\n" -#: cmdline/apt-get.cc:1992 +#: 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" -#: cmdline/apt-get.cc:1997 +#: 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" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2065 +#: 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" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2078 +#: 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" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2130 +#: 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" -#: cmdline/apt-get.cc:2158 +#: 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" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1181,7 +1220,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1190,32 +1229,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1230,6 +1269,8 @@ msgid "" " 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" @@ -1245,7 +1286,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1265,18 +1306,20 @@ msgstr "" "e install.\n" "\n" "Comandi:\n" -" update - Aggiorna la lista dei pacchetti\n" -" upgrade - Esegue un aggiornamento\n" -" install - Installa nuovi pacchetti (pkg è libc6 non libc6.deb)\n" +" update - Scarica la nuova lista di pacchetti\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" " source - Scarica i pacchetti sorgente\n" " build-dep - Configura le dipendenze di compilazione per i pacchetti " "sorgente\n" -" dist-upgrade - Aggiorna la distribuzione, vedere apt-get(8)\n" +" dist-upgrade - Aggiornamento della distribuzione, vedere apt-get(8)\n" " dselect-upgrade - Segue le selezioni di dselect\n" -" clean - Cancella gli archivi dei pacchetti scaricati \n" -" autoclean - Cancella gli archivi vecchi scaricati\n" -" check - Verifica che non ci siano dipendenze rotte\n" +" clean - Cancella l'archivio temporaneo dei pacchetti scaricati \n" +" autoclean - Cancella vecchi archivi temporanei di pacchetti scaricati\n" +" check - Verifica che non ci siano dipendenze insoddisfatte\n" "\n" "Opzioni:\n" " -h Questo help.\n" @@ -1366,29 +1409,33 @@ msgstr "" msgid "Bad default setting!" msgstr "Opzione predefinita errata!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: 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." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Cancellare 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:100 +#: 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 " -#: dselect/install:101 +#: 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 " -#: dselect/install:102 +#: 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 " -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1399,190 +1446,190 @@ msgstr "" msgid "Merging available information" msgstr "Aggiornamento delle informazioni disponibili" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Impossibile creare delle pipe" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Impossibile eseguire gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archivio corrotto" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar fallito, archivio corrotto" -#: apt-inst/contrib/extracttar.cc:299 +#: 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" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Firma dell'archivio non valida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Errore nella lettura del member header dell'archivio" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Member header dell'archivio non valido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'archivio è troppo corto" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Impossibile leggere gli header dell'archivio" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Dropnode invocata su un nodo ancora collegato" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Impossibile localizzare l'elemento hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Impossibile allocare la deviazione" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Errore interno in AddDiversion" -#: apt-inst/filelist.cc:481 +#: 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" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppia aggiunta di deviazione %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplice %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: 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" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s fallita" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: 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" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Estrazione di %s eseguita più di una volta" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "La directory %s è deviata" -#: apt-inst/extract.cc:147 +#: 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" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Il path della deviazione è troppo lungo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "La directory %s sta per essere sostituita da una non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Impossibile localizzare il nodo nel suo hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Il path è troppo lungo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Impossibile leggere %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossibile analizzare %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Impossibile rimuovere %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossibile creare %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Impossibile analizzare %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: 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" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Impossibile raggiungere la directory admin %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lettura della lista dei file in corso" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1593,77 +1640,77 @@ msgstr "" "questo file allora crearne uno vuoto e reinstallare immediatamente la stessa " "versione del pacchetto!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Errore interno nel prendere un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Impossibile aprire il file di diversion %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Il file di diversion è corrotto" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Errore interno nell'aggiunta di una diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "La cache dei pacchetti deve prima essere inizializzata" -#: apt-inst/deb/dpkgdb.cc:443 +#: 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" -#: apt-inst/deb/dpkgdb.cc:465 +#: 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" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Errore nel parsing MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Questo non è un archivio DEB valido, campi '%s' o '%s' mancanti" +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" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Impossibile cambiare su %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Errore interno, impossibile localizzare il campo" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Impossibile localizzare un file control valido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "File control non corretto" @@ -1684,26 +1731,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM sbagliato" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: 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)" @@ -1765,7 +1811,7 @@ msgstr "Timeout della connessione" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" @@ -1777,7 +1823,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Corruzione nel protocollo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" @@ -1832,7 +1878,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1859,60 +1905,60 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Impossibile invocare " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Connessione a %s (%s) in corso" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." -#: methods/connect.cc:93 +#: 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" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Impossibile risolvere '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "risoluzione di '%s' temporaneamente fallita" -#: methods/connect.cc:176 +#: 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)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" @@ -1922,37 +1968,37 @@ msgstr "Impossibile connettersi a %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Impossibile accedere al keyring '%s'" -#: methods/gpgv.cc:100 +#: 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." -#: methods/gpgv.cc:204 +#: 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?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Almeno una firma non valida è stata trovata." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Impossibile esseguire '%s' per verificare la firma (gnupg è installato?)" +"Impossibile esseguire '%s' per verificare la firma (gpgv è installato?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1970,433 +2016,458 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:521 +#: 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" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:548 methods/http.cc:555 +#: 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:584 +#: 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" -#: methods/http.cc:599 +#: 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" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:873 +#: 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" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Impossibile troncare il file" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Errore interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Impossibile eseguire mmap su un file vuoto" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo di abbreviazione non riconosciuto: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Apertura del file di configurazione %s in corso" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linea %d troppo lunga (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: 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" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Errore di sintassi %s:%u: Tag malformato" -#: apt-pkg/contrib/configuration.cc:644 +#: 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" -#: apt-pkg/contrib/configuration.cc:684 +#: 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" -#: apt-pkg/contrib/configuration.cc:691 +#: 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" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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" -#: apt-pkg/contrib/configuration.cc:704 +#: 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'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errore!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fatto" -#: apt-pkg/contrib/cmndline.cc:80 +#: 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." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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" -#: apt-pkg/contrib/cmndline.cc:127 +#: 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" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "L'opzione %s richiede un argomento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opzione %s: la specifica di configurazione del parametro deve avere un " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: 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'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "L'opzione '%s' è troppo lunga" -#: apt-pkg/contrib/cmndline.cc:301 +#: 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." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operazione non valida %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Impossibile accedere al cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: 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" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: 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" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Impossibile ottenere il lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: 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" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: 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)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: 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" -#: apt-pkg/contrib/fileutl.cc:522 +#: 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" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Si è verificato un problema chiudendo il file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Si è verificato un problema rimuovendo il file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Si è verificato un problema sincronizzando il file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache dei pacchetti vuota" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Il file cache dei pacchetti è corrotto" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Il file cache dei pacchetti è in una versione incompatibile" -#: apt-pkg/pkgcache.cc:142 +#: 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'" -#: apt-pkg/pkgcache.cc:147 +#: 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" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Consiglia" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Raccomanda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Va in conflitto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Sostituisce" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Rende obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Rompe" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "richiesto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opzionale" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +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" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Impossibile scrivere il file temporaneo di stato (StateFile) %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: 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" -#: apt-pkg/sourcelist.cc:96 +#: 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" -#: apt-pkg/sourcelist.cc:99 +#: 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" -#: apt-pkg/sourcelist.cc:105 +#: 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" -#: apt-pkg/sourcelist.cc:112 +#: 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" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: 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." -#: apt-pkg/sourcelist.cc:240 +#: 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" -#: apt-pkg/sourcelist.cc:244 +#: 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" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: 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" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2407,12 +2478,12 @@ msgstr "" "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 " -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo '%s' non è supportato" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2420,7 +2491,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " "archivio per esso." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2428,192 +2499,218 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere " "causato da pacchetti bloccati " -#: apt-pkg/algorithms.cc:1061 +#: 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" -#: apt-pkg/acquire.cc:62 +#: 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." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manca la directory di liste %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Scaricamento file %li di %li (%s rimanente)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Scaricamento file %li di %li" -#: apt-pkg/acquire-worker.cc:113 +#: 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." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Il metodo %s non è partito correttamente" -#: apt-pkg/acquire-worker.cc:377 +#: 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." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossibile analizzare %s." -#: apt-pkg/srcrecords.cc:48 +#: 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" -#: apt-pkg/cachefile.cc:73 +#: 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." -#: apt-pkg/cachefile.cc:77 +#: 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" -#: apt-pkg/policy.cc:269 +#: 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\"" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Impossibile capire il tipo di pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nessuna (o zero) priorità specificata per il pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La cache ha un sistema incompatibile di gestione delle versioni" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Errore nell'analisi di %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Errore nell'analisi di %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" -#: apt-pkg/pkgcachegen.cc:210 +#: 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" -#: apt-pkg/pkgcachegen.cc:213 +#: 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" + +#: 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" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: 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" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Il File Collezionato Fornisce" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: 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" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +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" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2623,7 +2720,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2632,7 +2729,7 @@ msgstr "" "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2640,7 +2737,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2649,7 +2746,7 @@ msgstr "Le Dimensioni non corrispondono" msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene dati" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2658,47 +2755,60 @@ msgstr "" "Si userà il punto di montaggio del CD-ROM %s\n" "Montaggio CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificazione in corso.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Etichette salvate: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Smontaggio CD-ROM in corso...\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" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM in corso\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM in corso \n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di " +"traduzione e %zu firme\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Etichetta trovata \"%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" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2707,94 +2817,114 @@ msgstr "" "Questo disco è chiamato: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copia della lista dei pacchetti in corso..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Scrittura di una nuova lista sorgenti in corso\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Le voci lista sorgenti per questo Disco sono:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Smontaggio CD-ROM in corso..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installazione di %s in corso" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Configurazione di %s in corso" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Rimozione di %s in corso" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Esecuzione del comando post installazione %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Manca la directory '%s'" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Scompattamento di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Configurazione di %s in corso" +msgid "Processing triggers for %s" +msgstr "Elaborazione opzioni addizionali per %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s Installato" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Rimozione di %s in corso" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s rimosso" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione totale di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Rimozione totale completata %s" +#: 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" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" msgstr "Impossibile aprire il file %s" @@ -2802,8 +2932,51 @@ msgstr "Impossibile aprire il file %s" 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" +#~ msgstr "La data del file Ú cambiata %s" #~ msgid "Reading file list" #~ msgstr "Lettura della lista dei file in corso" diff --git a/po/ja.po b/po/ja.po index ccd9cf7..1494f80 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,158 +3,166 @@ # Project Vine, Daisuke SUZUKI , 2001-2002 # Debian Project, Masato Taruishi , 2002 # Debian Project, Keita Maehara , 2003 -# Debian Project, Kenshi Muto , 2004 +# Debian Project, Kenshi Muto , 2004-2008 msgid "" msgstr "" -"Project-Id-Version: apt 0.6\n" +"Project-Id-Version: apt 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-08 19:57+0900\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 09:26+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8 bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 が見つかりません" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "パッケージ名総数: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 通常パッケージ: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 純粋仮想パッケージ: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 単一仮想パッケージ: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 複合仮想パッケージ: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 欠落: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "個別バージョン総数: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "個別説明総数: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "依存関係総数: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "バージョン/ファイル関係総数: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "説明/ファイル関係総数: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "提供マッピング総数: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob 文字列の総数: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "総依存関係・バージョン容量: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "総空き容量: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "総占有容量: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pin パッケージ:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(見つかりません)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(なし)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s for %s %s コンパイル日時: %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s for %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +185,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -213,8 +221,8 @@ msgstr "" " show - パッケージの情報を表示する\n" " depends - パッケージが依存しているパッケージを表示する\n" " rdepends - パッケージの逆依存情報を表示する\n" -" pkgnames - すべてのパッケージ名を表示する\n" -" dotty - GraphVis 用のパッケージグラフを生成する\n" +" pkgnames - システム内のすべてのパッケージ名を表示する\n" +" dotty - GraphViz 用のパッケージグラフを生成する\n" " xvcg - xvcg 用のパッケージグラフを生成する\n" " policy - ポリシー設定情報を表示する\n" "\n" @@ -302,7 +310,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -312,31 +320,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +425,26 @@ msgstr "" " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -444,278 +452,278 @@ msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" "ベースを削除・再作成してください。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB ファイル %s を開くことができません: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告: ディレクトリ %s が読めません\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告: %s の状態を取得できません\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "エラー: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "警告: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "エラー: エラーが適用されるファイルは " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "%s の解決に失敗しました" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "ツリー内での移動に失敗しました" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s のオープンに失敗しました" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " リンク %s [%s] を外します\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "%s のリンク読み取りに失敗しました" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "%s のリンク解除に失敗しました" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s を %s にリンクするのに失敗しました" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部エラー、メンバー %s を特定できません" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "'%s' をオープンできません" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "不正な override %s %lu 行目 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "不正な override %s %lu 行目 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "不正な override %s %lu 行目 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "override ファイル %s を読み込むのに失敗しました" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' は未知の圧縮アルゴリズムです" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "圧縮出力 %s には圧縮セットが必要です" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "FILE* の作成に失敗しました" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "fork に失敗しました" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "圧縮子プロセス" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "展開ツール" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " または" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -723,146 +731,146 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "依存関係を解決しています ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " 失敗しました。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "依存関係を訂正できません" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "アップグレードセットを最小化できません" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " 完了" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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 なしで使用されました" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "ソースのリストを読むことができません。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "展開後に追加で %sB のディスク容量が消費されます。\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "展開後に %sB のディスク容量が解放されます。\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +881,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,49 +910,49 @@ msgstr "" "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意、%2$s の代わりに %1$s を選択します\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" "プします。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "パッケージ %s はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [インストール済み]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,77 +963,121 @@ msgstr "" "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" "あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "パッケージ %s にはインストール候補がありません" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"一連のものを削除するようになっていないので、AutoRemover を開始できません" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" -"るか、古いものが代わりに使われます。" +"以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 が、本来起きるべきでない何かを壊したようです。\n" +"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 "以下の情報がこの問題を解決するために役立つかもしれません:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "内部エラー、AutoRemover が何かを破壊しました" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "タスク %s が見つかりません" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1516 +#: 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:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1033,7 +1085,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1045,132 +1097,118 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1569 -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" -"さい。" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1217,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1226,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1228,6 +1266,8 @@ msgid "" " 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" @@ -1243,7 +1283,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1269,6 +1309,9 @@ msgstr "" " install - 新規パッケージをインストールします\n" " (pkg は libc6.deb ではなく libc6 のように指定します)\n" " remove - パッケージを削除します\n" +" autoremove - 自動インストールされ使われていないすべてのパッケージを削除し" +"ます\n" +" purge - 設定ファイルまで含めてパッケージを削除します\n" " source - ソースアーカイブをダウンロードします\n" " build-dep - ソースパッケージの構築依存関係を設定します\n" " dist-upgrade - ディストリビューションをアップグレードします\n" @@ -1281,7 +1324,7 @@ msgstr "" "オプション:\n" " -h このヘルプを表示する\n" " -q ログファイルに出力可能な形式にする - プログレス表示をしない\n" -" -qq エラー以外は表示しない\n" +" -qq エラー以外は表示しない\n" " -d ダウンロードのみ行う - アーカイブのインストールや展開は行わない\n" " -s 実際には実行しない。実行シミュレーションのみ行う\n" " -y すべての問い合わせに Yes で答え、プロンプトは返さない\n" @@ -1365,24 +1408,28 @@ msgstr "" msgid "Bad default setting!" msgstr "不正なデフォルト設定です!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: 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 を押すと続行します。" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "過去にダウンロードした .deb ファイルを削除しますか?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "展開中にエラーが発生しました。インストールされたパッケージを" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "設定します。これにより、エラーが複数出るか、依存関係の欠如に" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "よるエラーが出るかもしれません。これには問題はなく、上記のメッセージ" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "が重要です。これを修正して「導入」を再度実行してください" @@ -1391,189 +1438,189 @@ msgstr "が重要です。これを修正して「導入」を再度実行して msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "パイプの生成に失敗しました" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "gzip の実行に失敗しました" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "壊れたアーカイブ" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサムが失敗しました。アーカイブが壊れています" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "不正なアーカイブ署名" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "不正なアーカイブメンバーヘッダ" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "アーカイブが不足しています" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "アーカイブヘッダの読み込みに失敗しました" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "リンクされているノードで DropNode が呼ばれました" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "ハッシュ要素を特定することができません!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion の割り当てに失敗しました" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion での内部エラー" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s の diversion が二重に追加されています" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "パス %s は長すぎます" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s を複数回展開しています" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "ディレクトリ %s は divert されています" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "diversion パスが長すぎます" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "パスが長すぎます" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s に対するバージョンのないパッケージマッチを上書きします" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 を読み込むことができません" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s の状態を取得できません" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s の削除に失敗しました" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s を作成できません" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo の状態の取得に失敗しました" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "パッケージリストを読み込んでいます" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "管理ディレクトリ %sinfo への移動に失敗しました" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "パッケージ名取得中の内部エラー" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "ファイルリストを読み込んでいます" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1584,79 +1631,79 @@ msgstr "" "とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン" "ストールしてください!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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 の読み込みに失敗しました" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "内部エラー、ノードの取得" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "diversions ファイル %sdiversions のオープンに失敗しました" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "diversion ファイルが壊れています" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "diversion ファイルに不正な行があります: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "内部エラー、diversion の追加" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "最初にパッケージキャッシュを初期化しなければなりません" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 の解析エラー。オフセット %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "'%s' メンバーがないため、正しい DEB アーカイブではありません" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ" -"ん" +"これは正しい DEB アーカイブではありません。'%s'、'%s'、'%s' のいずれのメン" +"バーもありません" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "%s に変更できませんでした" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "内部エラー、メンバーを特定できません" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "正しいコントロールファイルを特定できませんでした" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "解析できないコントロールファイル" @@ -1677,26 +1724,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD が違います" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "状態の取得に失敗しました" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1758,7 +1804,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1770,7 +1816,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -1824,7 +1870,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1851,59 +1897,59 @@ msgstr "問い合わせ" msgid "Unable to invoke " msgstr "呼び出せません" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) への接続を開始できません。" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' を解決できませんでした" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s' (%i) の解決中に問題が起こりました" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s へ接続できません:" @@ -1913,35 +1959,36 @@ msgstr "%s %s へ接続できません:" msgid "Couldn't access keyring: '%s'" msgstr "キーリングにアクセスできませんでした: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。" +msgstr "" +"エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされ" -"ていますか?)" +"署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて" +"いますか?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1957,427 +2004,452 @@ msgstr "%s に対してパイプを開けませんでした" msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "ファイルの切り詰めに失敗しました" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "内部エラー" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "空のファイルを mmap できません" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "選択された %s が見つかりません" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "%d 行目が長すぎます (最大 %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: 命令はトップレベルでのみ実行できます" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: ここからインクルードされています" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... エラー!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完了" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "コマンドラインオプション '%c' [%s から] は不明です。" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 を理解できません" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "コマンドラインオプション %s は boolean ではありません" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "オプション %s には引数が必要です。" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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: 設定項目には =<値> を指定する必要があります。" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "オプション %s には '%s' ではなく整数の引数が必要です" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "オプション '%s' は長すぎます" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s を解釈することができません。true か false を試してください。" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "不正な操作 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 へ変更することができません" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "空のパッケージキャッシュ" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "パッケージキャッシュファイルが壊れています" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "この APT はバージョニングシステム '%s' をサポートしていません" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "先行依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "提案" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推奨" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "競合" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "置換" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "廃止" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "破壊" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "要求" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "任意" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "依存関係ツリーを作成しています" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "候補バージョン" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "依存関係の生成" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "状態情報を読み取っています" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "状態ファイル %s のオープンに失敗しました" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "一時状態ファイル %s の書き込みに失敗しました" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: 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 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: 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 行目が不正です (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2388,12 +2460,12 @@ msgstr "" "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "インデックスファイルのタイプ '%s' はサポートされていません" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2401,7 +2473,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2409,189 +2481,213 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/acquire.cc:62 +#: 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 "" +"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" +"るか、古いものが代わりに使われます。" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "アーカイブディレクトリ %spartial が見つかりません。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "ファイルを取得しています %li/%li (残り %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "ファイルを取得しています %li/%li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "メソッドドライバ %s が見つかりません。" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:377 +#: 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 を押してくださ" "い。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケージシステムタイプを特定できません" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s の状態を取得できません。" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list に 'ソース' URI を指定する必要があります" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "パッケージリストまたはステータスファイルを解釈またはオープンすることができま" "せん。" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" "ん" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s が理解できませんでした" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "キャッシュに非互換なバージョニングシステムがあります" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s を処理中にエラーが発生しました (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s を処理中にエラーが発生しました (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "%s を処理中にエラーが発生しました (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s を処理中にエラーが発生しました (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s を処理中にエラーが発生しました (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s を処理中にエラーが発生しました (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s を処理中にエラーが発生しました (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "この APT が対応している以上の数のパッケージが指定されました。" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "この APT が対応している以上の数のバージョンが要求されました。" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "この APT が対応している以上の数の説明が要求されました。" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s を処理中にエラーが発生しました (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "ハッシュサムが適合しません" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2600,7 +2696,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2609,7 +2705,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2617,16 +2713,16 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "サイズが適合しません" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "ベンダブロック %s はフィンガープリントを含んでいません" +msgstr "ベンダブロック %s は鍵指紋を含んでいません" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2635,49 +2731,60 @@ msgstr "" "CD-ROM マウントポイント %s を使用します\n" "CD-ROM をマウントしています\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "確認しています.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM をアンマウントしています ...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM をアンマウントしています\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" -"た\n" +"%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック" +"ス、%zu の署名を見つけました\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "ラベル '%s' を見つけました\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2686,94 +2793,117 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM をアンマウントしています ..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "%s をインストールしています" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s を設定しています" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s を削除しています" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "インストール後トリガ %s を実行しています" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "ディレクトリ '%s' が見つかりません" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "%s を設定しています" +msgid "Processing triggers for %s" +msgstr "%s のトリガーを処理しています" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s を削除しています" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %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" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "ファイルにパッチできませんでした" @@ -2782,17 +2912,5 @@ msgstr "ファイルにパッチできませんでした" msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" -#~ msgid "File date has changed %s" -#~ msgstr "ファイル %s の日付が変更されています" - -#~ msgid "Reading file list" -#~ msgstr "ファイルリストを読み込んでいます" - -#~ msgid "Could not execute " -#~ msgstr "実行できませんでした:" - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "設定 %s の削除を準備しています" - -#~ msgid "Removed with config %s" -#~ msgstr "設定 %s を削除しました" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "動的 MMap が制限を越えました" diff --git a/po/km.po b/po/km.po index 6ad30ac..7177255 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -19,145 +19,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 បានឡើយ" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " កញ្ចប់​ធម្មតា ៖ " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " កញ្ចប់​និម្មិត​សុទ្ធ ៖ " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " កញ្ចប់​និម្មិត​តែ​មួយ ៖ " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " កញ្ចប់​និម្មិត​លាយ ៖ " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " បាត់បង់ ៖ " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "ភាព​អាស្រ័យ​សរុប ៖ " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "ទំហំ slack សរុប ៖" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "រក​កញ្ចប់​មិន​ឃើញ" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "ឯកសារ​កញ្ចប់ ៖" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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 ឯកសារ​កញ្ចប់​បាន​ទេ" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(រក​មិន​ឃើញ)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " បាន​ដំឡើង ៖ " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(គ្មាន)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " សាកល្បង ៖ " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " ខ្ទាស់​កញ្ចប់ ៖ " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -180,8 +191,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -217,7 +228,7 @@ msgstr "" " depends - បង្ហាញព័ត៌មាន​​ភាពអាស្រ័យ​កញ្ចប់​មិន​ទាន់​ច្នៃ\n" " rdepends - បង្ហាញ​ព័ត៌មាន​ភាពអាស្រ័យ​កញ្ចប់​បញ្ច្រាស់​\n" " pkgnames - រាយ​ឈ្មោះ​កញ្ចប់​ទាំងអស់​\n" -" dotty - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ GraphVis\n" +" dotty - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ GraphViz\n" " xvcg - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ xvcg\n" " policy - បង្ហាញ ការរៀបចំ​គោលការណ៍​\n" "\n" @@ -304,7 +315,7 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" @@ -313,31 +324,31 @@ msgstr "មិន​អាច​សរសេរ​ទៅ %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "​កំហុស​ដំណើរការ​ថត​ %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -418,26 +429,26 @@ msgstr "" " -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -445,278 +456,278 @@ msgstr "" "ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​" "មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W ៖ មិន​អាច​ថ្លែង %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "មែក​ធាង បាន​បរាជ័យ" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "មិន​អាចបើក​ %s បានឡើយ" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "បង្ហាប់កូន" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "កម្មវិធី​ពន្លា" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ឬ" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -724,143 +735,143 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " បាន​បរាជ័យ ។" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " ធ្វើ​រួច" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ `apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសារ ។\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +882,28 @@ msgstr "" "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "បោះបង់ ។" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,47 +911,47 @@ msgstr "" "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --" "fix- ដែលបាត់ឬ់ ?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [បានដំឡើង​]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -951,81 +962,124 @@ msgstr "" "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n" "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" + +#: 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:1549 +#: 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' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1037,136 +1091,122 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1569 -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" -"កញ្ចប់​នោះ​ គួរតែត្រូវបានបរាជ័យ ។" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,30 +1215,31 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1213,6 +1254,8 @@ msgid "" " 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" @@ -1228,7 +1271,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1347,24 +1390,28 @@ msgstr "" msgid "Bad default setting!" msgstr "ការ​កំណត់​លំនាំ​ដើម​មិន​ល្អ !" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "សង្កត់​ បញ្ចូល ​ដើម្បី​បន្ត ។" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "កំហុ​ស​មួយ​ចំនួន​បាន​កើត​ឡើង​ខណៈពេល​ពន្លា​កញ្ចប់ ។ ខ្ញុំ​នឹង​កំណត់រចនាសម្ប័ន្ធ" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "កញ្ចប់​ដែល​បាន​ដំឡើង​ ។ នេះ​ប្រហែល​ជា​លទ្ធផល​កំហុស​ស្ទួន​" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាត់បង់​ភាពអាស្រ័យ​ ។ ​មិន​អី​ទេ​ គ្រាន់​តែ​ជា​កំហុស " -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រត់​ការដំឡើង​ម្តងទៀត​" @@ -1373,188 +1420,188 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន msgid "Merging available information" msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "ប័ណ្ណសារ​បាន​ខូច​" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "ប័ណ្ណសារ ខ្លីពេក" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "ផ្លូវ​ %s វែង​ពេក" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "ថត​ %s ត្រូវបាន​បង្វែរ" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "ផ្លូវ​បង្វែរ វែងពេក" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "ផ្លូវ​វែង​ពេក" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 បានឡើយ" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "បរាជ័យក្នុងការយក %s ចេញ" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "មិន​អាច​បង្កើត​ %s បានឡើយ" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "បរាជ័យ​ក្នុងការថ្លែង %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរទៅជា​ថតអ្នកគ្រប់គ្រង %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "កំហុស​ក្នុង​ការ ក្នុងការ​ទទួល​យក​ឈ្មោះកញ្ចប់" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1564,77 +1611,77 @@ msgstr "" "បរាជ័យ​ក្នុងការ​បើក​ឯកសារ​បញ្ជី​ '%sinfo/%s' ។ ប្រសិនបើ​អ្នក​មិន​អាច​ស្តារ​ឯកសារ​នេះបានទេ បន្ទាប់​មក​" "ធ្វើឲ្យវា​ទទេ ហើយ​ដំឡើង​កញ្ចប់ដែលកំណែ​ដូចគ្នា​ឡើងវិញភ្លាមៗ !" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "កំហុស​ខាងក្នុង ក្នុង​​ការ​ទទួល​យក​ថ្នាំង​" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "បរាជ័យ​ក្នុងការ​បើក​ឯកសារបង្វែរ​ %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "ឯកសារ​បង្វែរ​បានខូច" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "កំហុស​ខាងក្នុង​ ក្នុង​ការបន្ថែម​ការបង្វែរ​" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "ឃ្លាំងសម្ងាត់ pkg ត្រូវ​តែ​ចាប់ផ្តើម​ដំឡើងមុន" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "បរាជ័យ​ក្នុងការរកកញ្ចប់ ៖ បឋមកថា​ អុហ្វសិត %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "ផ្នែក​ ConfFile ខូច នៅក្នុង​ឯកសារ​ស្ថានភាព ។ អុហ្វសិត​ %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "កំហុស​ក្នុងការញែក​ MD5 ។ អុហ្វសិត​ %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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'​" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "នេះជា​ប័ណ្ណសារ DEB មិន​ត្រឹមត្រូវ វាគ្មានសមាជិក '%s' ឬ '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "មិនអាច​ប្ដូរ​ទៅជា​ %s បានឡើយ" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "កំហុស​ខាងក្នុង មិន​អាចដាក់ទីតាំង​ឲ្យ​សមាជិក​បានឡើយ" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "បរាជ័យ​ក្នុងការដាក់ទិតាំង​ឯកសារ​ត្រួតពិនិត្យ​ដែលត្រឹមត្រូវ​" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន" @@ -1655,25 +1702,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "ស៊ីឌី-រ៉ូមខុស" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូម​ នៅ​​ក្នុង​ %s បានទេ វាអាចនៅតែប្រើបាន ។" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: 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 "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -1734,7 +1781,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1746,7 +1793,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -1800,7 +1847,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1827,59 +1874,59 @@ msgstr "សំណួរ​" msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP ៖ %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" @@ -1889,33 +1936,33 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ msgid "Couldn't access keyring: '%s'" msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1931,427 +1978,454 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប msgid "Read error from %s process" msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "កំពុង​រង់ចាំ​បឋមកថា" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "ជួរ​បឋមកថា​ខូច​" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "បន្ទាត់​ %d វែងពេក​ (អតិបរមា %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​" -#: apt-pkg/contrib/configuration.cc:684 +#: 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 ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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 ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... កំហុស ​!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... ធ្វើរួច​" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 ឡើយ" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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 ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន = មួយ ។" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "ជម្រើស​ '%s' វែងពេក" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 បានឡើយ" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "អាស្រ័យ​" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "អាស្រ័យជា​មុន" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "ផ្ដល់យោបល់​" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "ផ្តល់​អនុសាសន៍​" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "ប៉ះទង្គិច" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "ជំនួស​" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "លែង​ប្រើ" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "សំខាន់​" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "បាន​ទាមទារ" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "គំរូ" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "ស្រេចចិត្ត" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "បន្ថែម" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "កំណែ​សាកល្បង​" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "ការបង្កើត​ភាពអាស្រ័យ​" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2362,18 +2436,18 @@ msgstr "" "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::" "Force-LoopBreak សកម្ម ។" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" -#: apt-pkg/algorithms.cc:241 +#: 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 ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2381,179 +2455,206 @@ msgstr "" "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" "ដែលបាន​ទុក ។" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/acquire.cc:62 +#: 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 "" +"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:377 +#: 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' ហើយ​សង្កត់​ចូល ។" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "កំហុស​បាន​កើត​ឡើង​​ ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កញ្ចប់​ថ្មី​)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "កំហុស​បានកើត​ឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ១ថ្មី​)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "កំហុស​បាន​កើត​ឡើង​ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កំណែ២​ថ្មី​)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​%s (ផ្តល់​ឯកសារ​ប្រមូល​ផ្តុំ)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5Sum មិន​ផ្គួផ្គង​" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:753 +#: 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 " @@ -2562,7 +2663,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:812 +#: 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 " @@ -2570,13 +2671,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -2585,7 +2686,7 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Vendor block %s contains no fingerprint" msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2594,47 +2695,59 @@ msgstr "" "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" "កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "កំពុង​រង់ចាំឌីស​...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i និង ហត្ថលេខា %i \n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "បានទុក​ស្លាក ៖ %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2643,92 +2756,157 @@ msgstr "" "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "បាន​ដំឡើង %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "កំពុង​យក %s ចេញ" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "កំពុង​យក %s ចេញ" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" + #: 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" +#~ "កញ្ចប់​នោះ​ គួរតែត្រូវបានបរាជ័យ ។" + +#, 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 (កំណែ​​​ឯកសារ​ថ្មី​១)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)" + +#, 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" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "ជ្រើស​បាន​បរាជ័យ​" diff --git a/po/ko.po b/po/ko.po index d23c23f..aad1513 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,157 +1,165 @@ -# Sunjae Park , 2006. -# Changwoo Ryu , 2004-2005. +# Sunjae Park , 2006-2007, 2008. +# Changwoo Ryu , 2004-2005, 2008. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-12 21:22-0400\n" -"Last-Translator: Sunjae Park \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 07:14+0900\n" +"Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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:232 -msgid "Total package names : " -msgstr "전체 꾸러미 이름 : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "전체 패키지 이름 : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " 일반 꾸러미: " +msgstr " 일반 패키지: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " 순수 가상 꾸러미: " +msgstr " 순수 가상 패키지: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " 단일 가상 꾸러미: " +msgstr " 단일 가상 패키지: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " 혼합 가상 꾸러미: " +msgstr " 혼합 가상 패키지: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 빠짐: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "전체 구역별 버전: " +msgstr "개별 버전 전체: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "개별 설명 전체: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "전체 의존성: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "전체 버전/파일 관계: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "전체 설명/파일 관계: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "전체 제공 매핑: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "전체 패턴 문자열: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "전체 의존성 버전 용량: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "전체 빈 용량: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: 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:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "정확히 한 개의 패턴을 넘겨야 합니다" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" -msgstr "꾸러미가 없습니다" +msgstr "패키지가 없습니다" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "꾸러미 파일:" +msgstr "패키지 파일:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "핀 꾸러미:" +msgstr "핀 패키지:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(없음)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(없음)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " 꾸러미 핀: " +msgstr " 패키지 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s(%s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -174,8 +182,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -191,47 +199,47 @@ msgid "" msgstr "" "사용법: apt-cache [옵션] 명령\n" " apt-cache [옵션] add 파일1 [파일2 ...]\n" -" apt-cache [옵션] showpkg 꾸러미1 [꾸러미2 ...]\n" -" apt-cache [옵션] showsrc 꾸러미1 [꾸러미2 ...]\n" +" apt-cache [옵션] showpkg 패키지1 [패키지2 ...]\n" +" apt-cache [옵션] showsrc 패키지1 [패키지2 ...]\n" "\n" "apt-cache는 APT의 바이너리 캐시 파일을 처리하고, 캐시 파일에\n" "정보를 질의하는 저수준 도구입니다.\n" "\n" "명령:\n" -" add - 소스 캐시에 꾸러미 파일을 더합니다\n" -" gencaches - 꾸러미 캐시 및 소스 캐시를 만듭니다\n" -" showpkg - 한 개의 꾸러미에 대한 일반적인 정보를 보여줍니다\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 - GraphVis용 꾸러미 그래프를 만듭니다\n" -" xvcg - xvcg용 꾸러미 그래프를 만듭니다\n" +" search - 정규식 패턴에 맞는 패키지 목록을 찾습니다\n" +" show - 패키지에 대해 읽을 수 있는 기록을 봅니다\n" +" depends - 패키지에 대해 의존성 정보를 그대로 봅니다\n" +" rdepends - 패키지의 역 의존성 정보를 봅니다\n" +" pkgnames - 시스템에 들어 있는 패키지의 이름을 모두 봅니다\n" +" dotty - GraphViz용 패키지 그래프를 만듭니다\n" +" xvcg - xvcg용 패키지 그래프를 만듭니다\n" " policy - 정책 설정을 봅니다\n" "\n" "옵션:\n" " -h 이 도움말.\n" -" -p=? 꾸러미 캐시.\n" +" -p=? 패키지 캐시.\n" " -s=? 소스 캐시.\n" " -q 상태 표시를 하지 않습니다.\n" -" -i unmet 명령에서 중요한 의존성만 표시합니다.\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 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 "드라이브에 디스크를 넣고 엔터를 누르십시오" +msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -262,17 +270,17 @@ msgstr "" "\n" "명령:\n" " shell - 쉘 모드\n" -" dump - 설정을 보여 줍니다\n" +" dump - 설정을 봅니다\n" "\n" "옵션:\n" " -h 이 도움말.\n" " -c=? 해당 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\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 "" @@ -289,16 +297,16 @@ msgid "" msgstr "" "사용법: apt-extracttemplates 파일1 [파일2 ...]\n" "\n" -"apt-extracttemplates는 데비안 꾸러미에서 설정 및 템플릿 정보를 뽑아내는\n" +"apt-extracttemplates는 데비안 패키지에서 설정 및 템플릿 정보를 뽑아내는\n" "도구입니다\n" "\n" "옵션:\n" " -h 이 도움말\n" " -t 임시 디렉토리 설정\n" " -c=? 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" +" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -307,31 +315,31 @@ msgstr "%s에 쓸 수 없습니다" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "꾸러미 확장 목록이 너무 깁니다" +msgstr "패키지 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "%s 디렉토리를 처리하는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -385,7 +393,7 @@ msgstr "" "dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n" "\n" "apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n" -"Package 파일에는 각 꾸러미의 모든 제어 필드는 물론 MD5 해시와 파일\n" +"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n" "크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n" "강제로 설정할 수 있습니다\n" "\n" @@ -412,26 +420,26 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "맞는 꾸러미가 없습니다" +msgstr "맞는 패키지가 없습니다" -#: ftparchive/apt-ftparchive.cc:835 +#: 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:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -439,430 +447,430 @@ msgstr "" "DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 " "지우고 다시 만드십시오." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "경고: %s의 정보를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "오류: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "경고: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "%s의 경로를 알아내는 데 실패했습니다" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "트리에서 이동이 실패했습니다" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s 파일을 여는 데 실패했습니다" # FIXME: ?? -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애기\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "%s 파일에 readlink하는 데 실패했습니다" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "%s 파일을 지우는 데 실패했습니다" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** %s 파일을 %s(으)로 링크하는 데 실패했습니다" +msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "아카이브에 꾸러미 필드가 없습니다" +msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는 데 실패했습니다" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "%s을(를) 열 수 없습니다" +msgstr "%s 열 수 없습니다" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "override 파일 %s을(를) 읽는 데 실패했습니다" +msgstr "%s override 파일을 읽는 데 실패했습니다" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "FILE*를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "fork하는 데 실패했습니다" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "압축 하위 프로세스" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "내부 오류, %s을(를) 만드는 데 실패했습니다" +msgstr "내부 오류, %s 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는 데 실패했습니다: " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "압축 해제 프로그램" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는 데 실패했습니다" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는 데 실패했습니다" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는 데 문제가 있습니다" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "다음 꾸러미의 의존성이 맞지 않습니다:" +msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "하지만 %s 꾸러미를 설치했습니다" +msgstr "하지만 %s 패키지를 설치했습니다" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "하지만 %s 꾸러미를 설치할 것입니다" +msgstr "하지만 %s 패키지를 설치할 것입니다" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" -msgstr "하지만 가상 꾸러미입니다" +msgstr "하지만 가상 패키지입니다" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다" +msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " 혹은" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "다음 새 꾸러미를 설치할 것입니다:" +msgstr "다음 새 패키지를 설치할 것입니다:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "다음 꾸러미를 지울 것입니다:" +msgstr "다음 패키지를 지울 것입니다:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "다음 꾸러미를 과거 버전으로 유지합니다:" +msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "다음 꾸러미를 업그레이드할 것입니다:" +msgstr "다음 패키지를 업그레이드할 것입니다:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "다음 꾸러미를 다운그레이드할 것입니다:" +msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:" +msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"경고: ê¼­ 필요한 다음 꾸러미를 지우게 됩니다.\n" +"경고: ê¼­ 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " 실패." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" +msgstr "경고: 다음 패키지를 인증할 수 없습니다!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " +msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "인증할 수 없는 꾸러미가 있습니다" +msgstr "인증할 수 없는 패키지가 있습니다" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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 옵션 없이 사용되었습니다" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "내부 오류. 망가진 꾸러미에서 InstallPackages를 호출했습니다!" +msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." +msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "소스 목록을 읽을 수 없습니다." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" "시오." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +881,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" +msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,311 +910,340 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "빠진 꾸러미를 바로잡을 수 없습니다." +msgstr "빠진 패키지를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" +msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" +"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:1058 +#: 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:1069 +#: 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:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "설치하려면 분명하게 하나를 선택해야 합니다." +msgstr "설치할 패키지를 하나 분명히 지정해야 합니다." -#: cmdline/apt-get.cc:1091 +#: 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 "" -"%s 꾸러미를 사용할 수 없습니다. 하지만 다른 꾸러미가 참조하고 있습니다.\n" -"해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" -"꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" +"%s 패키지를 사용할 수 없습니다. 하지만 다른 패키지가 참조하고 있습니다.\n" +"해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" +"패키지를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "하지만 다음 꾸러미가 대체합니다:" +msgstr "하지만 다음 패키지가 대체합니다:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" -msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" +msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:1133 +#: 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:1141 +#: 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:1168 +#: 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:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" +msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" +msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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가 뭔가를 망가뜨린 것으로 보입니다. 이 문제는 실제 일어나서는\n" +"안 됩니다. 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 "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" + +#: 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 작업를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: 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:1516 +#: 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:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1549 +#: 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'을 시도해 보십시오 " +"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"몇몇 꾸러미를 설치할 수 없습니다. 요청한 상황이 불가능할 수도 있고,\n" -"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" +"몇몇 패키지를 설치할 수 없습니다. 요청한 상황이 불가능할 수도 있고,\n" +"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1569 -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" -"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" -msgstr "망가진 꾸러미" +msgstr "망가진 패키지" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "다음 꾸러미를 더 설치할 것입니다:" +msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "제안하는 꾸러미:" +msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" -msgstr "추천하는 꾸러미:" +msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" +msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" +msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" -msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" +msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" +msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" +"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2282 +#: 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 "" -"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" +"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2317 +#: 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 꾸러미가 너" +"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1221,6 +1258,8 @@ msgid "" " 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" @@ -1236,7 +1275,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1248,40 +1287,42 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "사용법: apt-get [옵션] 명령어\n" -" apt-get [옵션] install|remove 꾸러미1 [꾸러미2 ...]\n" -" apt-get [옵션] source 꾸러미1 [꾸러미2 ...]\n" +" apt-get [옵션] install|remove 패키지1 [패키지2 ...]\n" +" apt-get [옵션] source 패키지1 [패키지2 ...]\n" "\n" -"apt-get은 꾸러미를 내려받고 설치하는 간단한 명령행 인터페이스입니다.\n" +"apt-get은 패키지를 내려받고 설치하는 간단한 명령행 인터페이스입니다.\n" "가장 자주 사용하는 명령은 update와 install입니다.\n" "\n" "명령어:\n" -" update - 꾸러미 목록을 새로 가져옵니다\n" +" update - 패키지 목록을 새로 가져옵니다\n" " upgrade - 업그레이드를 합니다\n" -" install - 새 꾸러미를 설치합니다 (꾸러미는 libc6 식으로. libc6.deb 아님)\n" -" remove - 꾸러미를 지웁니다\n" -" source - 소스 아카이브를 내려 받습니다\n" -" build-dep - 소스 꾸러미의 빌드 의존성을 설정합니다\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" " autoclean - 과거에 내려받은 아카이브 파일들을 지웁니다\n" -" check - 의존성이 망가지지 않았는 지 확인합니다\n" +" check - 의존성이 망가지지 않았는지 확인합니다\n" "\n" "옵션:\n" " -h 이 도움말.\n" " -q 기록 가능한 출력 - 진행 상황 표시를 하지 않습니다\n" -" -qq 오류가 아니면 출력을 하지 않습니다\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) 및\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)나\n" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" @@ -1324,7 +1365,7 @@ msgstr "" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "알 수 없는 꾸러미 기록!" +msgstr "알 수 없는 패키지 기록!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1341,7 +1382,7 @@ msgid "" msgstr "" "사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n" "\n" -"apt-sortpkgs는 꾸러미 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일" +"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일" "인지\n" "알아 내는 데 쓰입니다.\n" "\n" @@ -1349,221 +1390,225 @@ msgstr "" " -h 이 도움말\n" " -s 소스 파일 정렬을 사용합니다\n" " -c=? 이 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" +" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" msgstr "기본 설정이 잘못되었습니다!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: 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를 누르십시오." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "압축을 푸는 데 몇몇 오류가 발생했습니다. 이미 설치된 꾸러미를" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "이전에 다운로드 받았던 .deb 파일을 지우시겠습니까?" #: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "압축을 푸는 데 몇몇 오류가 발생했습니다. 이미 설치된 패키지를" + +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "설정할 것입니다. 오류때문에 의존성을 만족하지 못해 설정하는 과정에서" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "오류가 중복되어 나타날 수 있습니다. 하지만 상관없고, 이 메세지 위에 나온" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 다시 시도하십시오" #: dselect/update:30 msgid "Merging available information" -msgstr "이용 가능 꾸러미 정보를 합칩니다" +msgstr "이용 가능 패키지 정보를 합칩니다" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "아카이브 시그너쳐가 틀렸습니다" +msgstr "아카이브 서명이 틀렸습니다" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "아카이브 멤버 헤더를 읽는 데 오류가 발생했습니다" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "아카이브 멤버 헤더가 잘못되었습니다" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "아카이브 길이가 너무 짧습니다" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "아카이브 헤더를 읽는 데 실패했습니다" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "해시 항목을 찾는 데 실패했습니다" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion을 할당하는 데 실패했습니다" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion에서 내부 오류" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는 데 실패했습니다" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "경로 %s이(가) 너무 깁니다" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s을(를) 두 번 이상 풀었습니다" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "%s 디렉토리가 전환되었습니다" -#: apt-inst/extract.cc:147 +#: 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:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "전환하는 경로가 너무 깁니다" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s 디렉토리를 디렉토리가 아닌 파일로 덮어쓰려고 합니다" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "해시 버킷에서 노드를 찾는 데 실패했습니다" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "경로가 너무 깁니다" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "덮어 쓰는 꾸러미가 %s 꾸러미의 어떤 버전과도 맞지 않습니다" +msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다" -#: apt-inst/extract.cc:434 +#: 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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을(를) 읽을 수 없습니다" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s의 정보를 읽을 수 없습니다" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s을(를) 지우는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s을(를) 만들 수 없습니다" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo의 정보를 읽는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "관리 디렉토리를 %sinfo로 바꾸는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "꾸러미 이름을 가져오는 데 내부 오류" +msgstr "패키지 이름을 가져오는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "파일 목록을 읽는 중입니다" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1571,79 +1616,79 @@ msgid "" "package!" msgstr "" "목록 파일 '%sinfo/%s' 파일을 여는 데 실패했습니다. 이 파일을 복구할 수 없다" -"ë©´ 비워 놓고 같은 버전의 꾸러미를 다시 설치하십시오!" +"ë©´ 비워 놓고 같은 버전의 패키지를 다시 설치하십시오!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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 파일을 읽는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "노드를 얻어 오는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "전환 파일 %sdiversions를 여는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "전환 파일이 손상되었습니다" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "diversion을 추가하는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "꾸러미 캐시를 먼저 초기화해야 합니다" +msgstr "패키지 캐시를 먼저 초기화해야 합니다" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "꾸러미를 찾는 데 실패했습니다: 헤더, 오프셋 %lu" +msgstr "패키지를 찾는 데 실패했습니다: 헤더, 오프셋 %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "status 파일에서 ConfFile 섹션이 잘못되었습니다. 오프셋 %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 분석에 오류가 있습니다. 오프셋 %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 혹은 '%s' 멤버가 없습니다" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "올바른 DEB 아카이브가 아닙니다. '%s'나 '%s' 혹은 '%s' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "내부 오류, 멤버를 찾을 수 없습니다" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "올바른 control 파일을 찾는 데 실패했습니다" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "control 파일을 파싱할 수 없습니다" @@ -1664,26 +1709,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "잘못된 CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "파일 정보를 읽는 데 실패했습니다" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1694,7 +1738,7 @@ msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다." #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "로그인하는 중" +msgstr "로그인하는 중입니다" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" @@ -1745,7 +1789,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1757,7 +1801,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -1811,7 +1855,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1838,59 +1882,59 @@ msgstr "질의" msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s에 연결할 수 없습니다:" @@ -1900,33 +1944,35 @@ msgstr "%s %s에 연결할 수 없습니다:" msgid "Couldn't access keyring: '%s'" msgstr "키링에 접근할 수 없습니다: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 종료하는 중." +msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "서명을 인증하기 위한 '%s' 실행할 수 없습니다(gnupg가 설치됐나요?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" +"서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습" +"니까?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1942,658 +1988,707 @@ msgstr "%s에 대한 파이프를 열 수 없습니다" msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "파일을 자르는 데 실패했습니다" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "내부 오류" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "빈 파일에 mmap할 수 없습니다" +msgstr "빈 파일에 메모리 매핑할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu바이트를 mmap할 수 없습니다" +msgstr "%lu바이트를 메모리 매핑할 수 없습니다" + +#: 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 "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "%d번 줄이 너무 깁니다 (최대 %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: 여기서 include됩니다" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 오류!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... 완료" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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' 옵션을 알 수 없습니다" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s 옵션에는 인수가 필요합니다." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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 옵션: 설정 항목 지정은 =<값> 형태여야 합니다." -#: apt-pkg/contrib/cmndline.cc:237 +#: 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:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "'%s' 옵션이 너무 깁니다" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s 센스를 이해할 수 없습니다. ì°¸ 아니면 거짓으로 해 보십시오." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "잘못된 작업 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 디렉토리로 이동할 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "꾸러미 캐시가 비어 있습니다" +msgstr "패키지 캐시가 비어 있습니다" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "꾸러미 캐시 파일이 손상되었습니다" +msgstr "패키지 캐시 파일이 손상되었습니다" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "꾸러미 캐시 파일이 호환되지 않는 버전입니다" +msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "이 APT는 Version System '%s'을(를) 지원하지 않습니다" +msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "꾸러미 캐시가 다른 아키텍쳐용입니다." +msgstr "패키지 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "선의존" +msgstr "미리의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "제안" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "추천" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "충돌" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "대체" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "없앰" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "망가뜨림" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "중요" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "필수" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "표준" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "옵션" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "별도" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "후보 버전" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "의존성 만들기" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "상태 정보를 읽는 중입니다" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "상태파일 %s 여는 데 실패했습니다" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "임시 상태파일 %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:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" +msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: 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번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: 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번 줄이 잘못되었습니다 (벤더 ID)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"이번에 설치할 때 충돌/선의존성이 루프가 걸렸기 때문에 ê¼­ 필요한 %s 꾸러미를 " -"잠깐 지워야 합니다. 이 꾸러미를 지우는 ê±´ 좋지 않지만, 정말 지우려면 APT::" +"이번에 설치할 때 충돌/선의존성이 루프가 걸렸기 때문에 ê¼­ 필요한 %s 패키지를 " +"잠깐 지워야 합니다. 이 패키지를 지우는 ê±´ 좋지 않지만, 정말 지우려면 APT::" "Force-LoopBreak 옵션을 켜십시오." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" -#: apt-pkg/algorithms.cc:241 +#: 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 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다." +"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수" +"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." +msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"일부 인덱스 파일을 다운로드하는 데 실패했습니다. 해당 파일을 무시하거나 과거" +"의 버전을 대신 사용합니다." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "목록 디렉토리 %spartial이 빠졌습니다." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "아카이브 디렉토리 %spartial이 빠졌습니다." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "파일 받아오는 중: %2$li 중 %1$li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오." +"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" +msgstr "'%s' 패키지 시스템을 지원하지 않습니다" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" +msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s의 정보를 읽을 수 없습니다." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "꾸러미 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." +msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 꾸러미 헤더가 없습니다" +msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다" +msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "캐시의 버전 시스템이 호환되지 않습니다" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "우와, 이 APT가 처리할 수 있는 꾸러미 이름 개수를 넘어갔습니다." +msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" +msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" +msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: 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:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다" +msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "해쉬 합계가 서로 다릅니다" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" +"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" +"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." +"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2602,7 +2697,7 @@ msgstr "크기가 맞지 않습니다" msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2611,47 +2706,58 @@ msgstr "" "CD-ROM 마운트 위치로 %s 사용\n" "CD-ROM을 마운트하는 중입니다\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "알아보는 중입니다.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "저장된 레이블: %s \n" +msgid "Stored label: %s\n" +msgstr "저장된 레이블: %s\n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "레이블 발견: %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2660,94 +2766,115 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "꾸러미 목록을 복사하는 중입니다..." +msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM을 마운트 해제하는 중입니다..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "%s 설치하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s 설정 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s 패키지를 지우는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "설치 후 트리거 %s 실행하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "디렉토리 '%s' 없습니다." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "%s 준비 중" +msgstr "%s 준비 중입니다" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" -msgstr "%s을(를) 푸는 중입니다" +msgstr "%s 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "%s을(를) 설정할 준비를 하는 중입니다" +msgstr "%s 패키지를 설정할 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "%s 설정 중" +msgid "Processing triggers for %s" +msgstr "%s의 트리거를 처리하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "%s 설치했음" +msgstr "%s 설치" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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을(를) 삭제할 준비 중" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s 지우는 중" +msgstr "%s 패키지를 지울 준비하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" +msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:379 +#: 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" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" msgstr "%s 파일을 열 수 없습니다" @@ -2755,12 +2882,13 @@ msgstr "%s 파일을 열 수 없습니다" msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" -#~ msgid "File date has changed %s" -#~ msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다" - -#~ msgid "Reading file list" -#~ msgstr "파일 목록을 읽는 중" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "동적 메모리 매핑이 범위를 벗어났습니다" -#, fuzzy -#~ msgid "Could not execute " -#~ msgstr "%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" +#~ "that package should be filed." +#~ msgstr "" +#~ "한 가지 작업만을 요청하셨으므로, 아마도 이 패키지를 설치할 수\n" +#~ "없는 경우일 것이고 이 패키지에 버그 보고서를 제출해야 합니다." diff --git a/po/ku.po b/po/ku.po index 06789f9..de81baa 100644 --- a/po/ku.po +++ b/po/ku.po @@ -1,159 +1,172 @@ +# translation of apt-ku.po to Kurdish # Kurdish translation for apt -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the apt package. -# FIRST AUTHOR , 2006. # +# FIRST AUTHOR , 2006. +# Erdal Ronahi , 2008. msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" -"PO-Revision-Date: 2006-09-16 17:51+0100\n" -"Last-Translator: Erdal Ronahi \n" -"Language-Team: Kurdish \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-05-08 12:48+0200\n" +"Last-Translator: Erdal Ronahi \n" +"Language-Team: ku \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KAider 0.1\n" +"Plural-Forms: nplurals=2; plural= n != 1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Pakêt nehate dîtin %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Navên paketan bi giştî :" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pakêtên normal:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pakêtên farazî yên safî:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pakêta tenê ya farazî:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pakêtên hevbeş yên farazî:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Winda: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Guhertoyên vekirî yên giştî:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Guhertoyên vekirî yên giştî:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Bindestên giştî:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Guhertoyên vekirî yên giştî:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Cihê giştî yê sist:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Cihê giştî yê veqetandî: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakêta dosya %s li derveyî demê ye." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Pêwist e tu mînakekê bidî" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Pakêt nayên dîtin" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pelgehên Pakêt:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nehate dîtin)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Sazkirî: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ne tiştek)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Berendam: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Destika pakêtê:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +189,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -255,7 +268,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -264,31 +277,31 @@ msgstr "Nivîsandin ji bo %s ne pêkane" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Di şixulandina pêrista %s de çewtî" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Dema şixulandina naveroka %s çewtî" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -330,445 +343,445 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Danegira %s nehate vekirin: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Tomara kontrola arşîvê tuneye" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: pelrêça %s nayê xwendin\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "%s ji hev nehate veçirandin" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s venebû" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s venebû" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " û" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: cmdline/apt-get.cc:546 +#: 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 "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "" +msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "%lu ji nû ve sazkirî" +msgstr "%lu ji nû ve sazkirî," -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "" +msgstr "%lu hatine nizmkirin." -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "" +msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Bindestî tên serrastkirin..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " neserketî." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "" +msgstr "Nikare bindestiyan rast kirin" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Temam" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 -#: apt-pkg/cachefile.cc:67 +#: 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 "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "" +msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "" +msgstr "Anîna %sB ji arşîvan pêwist e.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "" +msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "" +msgstr "Cihê vala li %s têre nake." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "" +msgstr "Erê, wusa bike!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -776,74 +789,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." -msgstr "" +msgstr "Betal." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "" +msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: 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 "" +msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "" +msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." -msgstr "" +msgstr "Sazkirin tê betalkirin." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Sazkirî]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -851,79 +864,122 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "" +msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Ev pakêtên NÛ dê werine sazkirin:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Peywira %s nehate dîtin" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" -msgstr "" +msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "lê %s dê were sazkirin" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -931,163 +987,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "" +msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "" +msgstr "Cihê vala li %s têre nake" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "" +msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "" +msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2275 +#: 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 "" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1102,6 +1147,8 @@ msgid "" " 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" @@ -1117,7 +1164,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1135,7 +1182,7 @@ msgstr "" #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "" +msgstr "Anîn:" #: cmdline/acqprogress.cc:110 msgid "Ign " @@ -1143,12 +1190,12 @@ msgstr "" #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "" +msgstr "Çewt" #: cmdline/acqprogress.cc:135 -#, c-format +#, fuzzy, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" +msgstr "%s hatine anîn..." #: cmdline/acqprogress.cc:225 #, c-format @@ -1185,24 +1232,28 @@ msgstr "" msgid "Bad default setting!" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1211,194 +1262,191 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 #, fuzzy msgid "Failed to create pipes" msgstr "%s ji hev nehate veçirandin" -#: apt-inst/contrib/extracttar.cc:144 -#, fuzzy +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "%s ji hev nehate veçirandin" +msgstr "Xebitandina gzip biserneket" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 -#, fuzzy +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "Tomara kontrola arşîvê tuneye" +msgstr "Arşîv zêde kin e" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 #, fuzzy msgid "Failed to allocate diversion" msgstr "%s venebû" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#, c-format msgid "Failed to write file %s" -msgstr "%s ji hev nehate veçirandin" +msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 -#, fuzzy, c-format +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#, c-format msgid "Failed to close file %s" -msgstr "%s venebû" +msgstr "Girtina pelê %s biserneket" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 -#, fuzzy, c-format +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#, c-format msgid "The path %s is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "Rêça %s zêde dirêj e" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 #, fuzzy msgid "The diversion path is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "" +msgstr "Rêç zêde dirêj e" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 -#, fuzzy, c-format +#: 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 venebû" +msgstr "Nikare %s bixwîne" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, fuzzy, c-format msgid "Unable to stat %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 -#, fuzzy, c-format +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#, c-format msgid "Failed to remove %s" -msgstr "%s ji hev nehate veçirandin" +msgstr "Rakirina %s biserneket" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 -#, fuzzy, c-format +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#, c-format msgid "Unable to create %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "Nikare %s biafirîne" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, fuzzy, c-format msgid "Failed to stat %sinfo" msgstr "%s venebû" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 -#, fuzzy +#: 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 "Paketên şikestî" +msgstr "Lîsteya pakêtan tê xwendin" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1406,77 +1454,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "" +msgstr "Nikarî li %s biguherîne" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "" @@ -1493,30 +1541,28 @@ msgstr "" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "" +msgstr "CD-ROM a şaş" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 -#, fuzzy +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "(nehate dîtin)" +msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 -#, fuzzy +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "(nehate dîtin)" +msgstr "Pel nehate dîtin" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1527,16 +1573,15 @@ msgstr "" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "" +msgstr "Têketin" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" msgstr "" #: methods/ftp.cc:173 -#, fuzzy msgid "Unable to determine the local name" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "Nikare navê herêmî tesbît bike" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format @@ -1577,9 +1622,9 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" -msgstr "" +msgstr "Çewiya xwendinê" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." @@ -1589,9 +1634,9 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "" +msgstr "Çewtiya nivîsînê" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1643,7 +1688,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1664,545 +1709,566 @@ msgstr "" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "" +msgstr "Lêpirsîn" #: methods/ftp.cc:1109 #, fuzzy msgid "Unable to invoke " msgstr "%s venebû" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "" +msgstr "Girêdan bi %s (%s) re pêk tê" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" -msgstr "" +msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "" +msgstr "Bi %s re tê girêdan" -#: methods/connect.cc:167 -#, fuzzy, c-format +#: methods/connect.cc:165 methods/connect.cc:184 +#, c-format msgid "Could not resolve '%s'" -msgstr "%s ji hev nehate veçirandin" +msgstr "Nikarî '%s' çareser bike" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 -#, fuzzy, c-format +#: methods/connect.cc:240 +#, c-format msgid "Unable to connect to %s %s:" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "Nikare bi %s re girêdan pêk bîne %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "" -#: methods/http.cc:773 -#, fuzzy +#: methods/http.cc:774 msgid "Select failed" -msgstr " neserketî." +msgstr "Hilbijartin neserketî" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:802 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:832 -#, fuzzy +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:860 -#, fuzzy +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Nivîsîna pelê %s biserneket" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "" +msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" -msgstr "" +msgstr "Çewtiya hundirîn" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 #, c-format -msgid "Selection %s not found" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "" +msgid "Selection %s not found" +msgstr "Hilbijartina %s nehatiye dîtin" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Opening configuration file %s" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Line %d too long (max %d)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "" +msgstr "%c%s... Çewtî!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... Çêbû" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 -#, fuzzy, c-format +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format msgid "Option '%s' is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "Opsiyona '%s' zêde dirêj e" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, fuzzy, c-format msgid "Unable to stat the mount point %s" msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#, fuzzy, c-format +#: 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 "Nivîsandin ji bo %s ne pêkane" +msgstr "Nikarî derbasa %s bike" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:154 +#, c-format msgid "Could not open lock file %s" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format msgid "Could not open file %s" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "" +msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "" +msgstr "Bindest" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "" +msgstr "PêşBindest" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" -msgstr "" +msgstr "Pêşniyaz dike" -#: apt-pkg/pkgcache.cc:219 -#, fuzzy +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" -msgstr "Paketên tên tawsiyê kirin:" +msgstr "Tawsiye dike" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" -msgstr "" +msgstr "Nakokî" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" -msgstr "" +msgstr "Dikeve şunve" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "" +msgstr "Kevin dike" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Dişkîne" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "important" -msgstr "" +msgstr "girîng" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" -msgstr "" +msgstr "pêwist" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" -msgstr "" +msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" -msgstr "" +msgstr "opsiyonel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" -msgstr "" +msgstr "ekstra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 -#, fuzzy +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" -msgstr " Berendam: " +msgstr "Guhartoyên berendam" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Vekirina StateFile %s biserneket" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s ji hev nehate veçirandin" + +#: apt-pkg/tagfile.cc:102 #, fuzzy, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:189 #, fuzzy, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "" +msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2210,365 +2276,427 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: 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 "" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "" +msgstr "Pel tê anîn %li ji %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, fuzzy, c-format msgid "Unable to stat %s." msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "" +msgstr "nav guherandin biserneket, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "" +msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash Sum li hev nayên" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: 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 "" -#: apt-pkg/acquire-item.cc:812 +#: 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 "" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "" +msgstr "Mezinahî li hev nayên" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Etîketa '%s' hatiye dîtin\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" +"Navê dîskê: \n" +"'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "" +msgstr "Lîsteyên pakêtan tên jibergirtin..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" -msgstr "" +msgstr "%i tomar hatin nivîsîn.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s hatine sazkirin" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 #, c-format -msgid "Preparing %s" -msgstr "" +msgid "Configuring %s" +msgstr "%s tê mîhengkirin" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 #, c-format -msgid "Unpacking %s" -msgstr "" +msgid "Removing %s" +msgstr "%s tê rakirin" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:52 #, c-format -msgid "Preparing to configure %s" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:521 #, c-format -msgid "Configuring %s" -msgstr "" +msgid "Directory '%s' missing" +msgstr "Peldanka '%s' kêm e" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:605 +#, c-format +msgid "Preparing %s" +msgstr "%s tê amadekirin" + +#: apt-pkg/deb/dpkgpm.cc:606 +#, c-format +msgid "Unpacking %s" +msgstr "%s tê derxistin" + +#: apt-pkg/deb/dpkgpm.cc:611 +#, c-format +msgid "Preparing to configure %s" +msgstr "Mîhengkirina %s tê amadekirin" + +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, fuzzy, c-format -msgid "Installed %s" -msgstr " Sazkirî: " +msgid "Processing triggers for %s" +msgstr "Di şixulandina pêrista %s de çewtî" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format -msgid "Preparing for removal of %s" -msgstr "" +msgid "Installed %s" +msgstr "%s hatine sazkirin" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:625 #, c-format -msgid "Removing %s" -msgstr "" +msgid "Preparing for removal of %s" +msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "" +msgstr "%s hatine rakirin" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "" +msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" +msgstr "%s bi tevahî hatine rakirin" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Danegira %s nehate vekirin: %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "" - +msgstr "Girêdan zû hatiye girtin" diff --git a/po/lt.po b/po/lt.po new file mode 100644 index 0000000..8eb2c5a --- /dev/null +++ b/po/lt.po @@ -0,0 +1,2813 @@ +# Lithuanian translation for apt +# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# This file is distributed under the same license as the apt package. +# Gintautas Miliauskas , 2008. +# Andrius Kokiančiks , 2008. +# +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-08-02 01:47-0400\n" +"Last-Translator: Gintautas Miliauskas \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n" + +#: cmdline/apt-cache.cc:143 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\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 "Nepavyko rasti paketo %s" + +#: cmdline/apt-cache.cc:247 +#, fuzzy +msgid "Total package names: " +msgstr "Visi paketų pavadinimai: " + +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " NormalÅ«s paketai: " + +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " VirtualÅ«s paketai: " + +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " Pavieniai virtualÅ«s paketai: " + +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " MiÅ¡rÅ«s virtualÅ«s paketai: " + +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " TrÅ«ksta: " + +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "Viso skirtingų versijų: " + +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Viso skirtingų apraÅ¡ymų: " + +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "Viso priklausomybių: " + +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "Viso versijų/failų santykių yra: " + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Viso apraÅ¡ymų/failų santykių yra: " + +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "" + +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " +msgstr "" + +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " +msgstr "" + +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "" + +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "" + +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." +msgstr "" + +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "" + +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "Paketų nerasta" + +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +msgstr "Paketų failai:" + +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" + +#: 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 "SuriÅ¡ti paketai:" + +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(nerasta)" + +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " Ä®diegta: " + +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(nėra)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " Kandidatas: " + +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr " Paketo susiejimai: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " Versijų lentelė:" + +#: 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 "" + +#: 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 "" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "PraÅ¡ome įdėti diską į įrenginį ir paspausti Enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Pakartokite Å¡itą procesą su kitais CD savo rinkinyje." + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Parametrai nurodyti ne poromis" + +#: 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 "" +"Panaudojimas: apt-config [parametrai] komanda\n" +"\n" +"apt-config yra paprastas įrankis nuskaityti APT konfigÅ«racijos failui\n" +"\n" +"Komandos:\n" +" shell - Shell rėžimas\n" +" dump - Parodyti konfigÅ«raciją\n" +"\n" +"Parinktys:\n" +" -h Å is pagalbos ekranas.\n" +" -c=? Nuskaityti pateiktą konfigÅ«racijos failą\n" +" -o=? Nurodyti tam tikrą konfigÅ«racijos parametrą, pvz -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s nėra tikras DEB paketas." + +#: 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 "" +"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" +"\n" +"apt-extracttemplates tai įrankis skirtas konfigÅ«racijų, bei Å¡ablonų " +"informacijos iÅ¡skleidimui\n" +"iÅ¡ debian paketų\n" +"\n" +"Parametrai:\n" +" -h Å is pagalbos tekstas\n" +" -t Nustatyti laikinąjį aplanką\n" +" -c=? Nuskaityti šį konfigÅ«racijų failą\n" +" -o=? Nustatyti savarankiÅ¡kas nuostatas, pvz.: -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 +#, c-format +msgid "Unable to write to %s" +msgstr "Nepavyko įraÅ¡yti į %s" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" + +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "Paketo plėtinių sąraÅ¡as yra per ilgas" + +#: 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 "Klaida apdorojant aplanką %s" + +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "Å altinio plėtinys yra per ilgas" + +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "Klaida įraÅ¡ant antraÅ¡tę į turinio failą" + +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "Klaida apdorojant turinį %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 "" +"Naudojimas: apt-ftparchive [parametrai] komanda\n" +"Komandos: dvejatainių paketų kelias [perraÅ¡omasfailas [kelioprieÅ¡dėlis]]\n" +" sources aplankas [perraÅ¡omasfailas [kelipprieÅ¡dėlis]]\n" +" contents kelias\n" +" release kelias\n" +" generate parametras [grupės]\n" +" clean parametras\n" +"\n" +"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi " +"keli \n" +"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių " +"pakeitimų\n" +"skirtų dpkg-scanpackages ir dpkg-scansources\n" +"\n" +"apt-ftparchive sugeneruoja paketų failus iÅ¡ .debs medžio. Paketo failas turi " +"visus\n" +"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų " +"dydžius. PerraÅ¡omasis\n" +"failas palaikomas tam, kad bÅ«tų priverstinai nustatytos Pirmenybių bei " +"Sekcijų reikÅ¡mės.\n" +"\n" +"PanaÅ¡iai apt-ftparchive sugeneruoja ir IÅ¡eities failus iÅ¡ .dscs medžio.\n" +"--source-override nuostata gali bÅ«ti naudojama nustatant iÅ¡eities " +"perraÅ¡omąjį failą\n" +"\n" +"\"Paketų\" bei \"IÅ¡eičių\" komandos turėtų bÅ«ti paleistos failų medžio " +"Å¡aknyje. BinaryPath turėtų\n" +"nurodyti kelią į rekursinės paieÅ¡kos pagrindą bei perraÅ¡ytas failas turėtų " +"turėti perraÅ¡ymo žymes.\n" +"KelioprieÅ¡dėlis tai yra priraÅ¡omas prie failo vardų laikų jei tokių yra. " +"Vartosenos pavyzdys\n" +"naudojant Debian archyvą:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Nuostatos:\n" +" -h Å is pagalbos tekstas\n" +" --md5 Valdyti MD5 generavimą\n" +" -s=? Å altinio perraÅ¡omas failas\n" +" -q Tylėti\n" +" -d=? Pasirinkti papildomą keÅ¡o duomenų bazę\n" +" --no-delink Ä®jungti atjungiamąjį derinimo rėžimą\n" +" -c=? Perskaityti šį nuostatų failą\n" +" -o=? Nustatyti savarankiÅ¡ką konfigÅ«racijos nuostatą" + +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "Nėra atitikmenų" + +#: ftparchive/apt-ftparchive.cc:832 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Kai kurių failų nėra paketų grupėje „%s“" + +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old" + +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Duomenų bazė yra sena, bandoma atnaujinti %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 "" +"Duomenų bazės formatas yra netinkamas. Jei jÅ«s atsinaujinote iÅ¡ senesnės " +"versijos, praÅ¡ome paÅ¡alinkite ir perkurkite duomenų bazę." + +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Nepavyko atverti DB failo %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 "Nepavyko patikrinti %s" + +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "" + +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" +msgstr "" + +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "Ä®: Nepavyko perskaityti aplanko %s\n" + +#: ftparchive/writer.cc:81 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "Ä®: Nepavyko patikrinti %s\n" + +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "K: " + +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "Ä®: " + +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "K: Klaidos failui " + +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#, c-format +msgid "Failed to resolve %s" +msgstr "Nepavyko iÅ¡spręsti %s" + +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "Judesys medyje nepavyko" + +#: ftparchive/writer.cc:195 +#, c-format +msgid "Failed to open %s" +msgstr "Nepavyko atverti %s" + +#: ftparchive/writer.cc:254 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "" + +#: ftparchive/writer.cc:262 +#, c-format +msgid "Failed to readlink %s" +msgstr "Nepavyko nuskaityti nuorodos %s" + +#: ftparchive/writer.cc:266 +#, c-format +msgid "Failed to unlink %s" +msgstr "Nepavyko atsieti nuorodos %s" + +#: ftparchive/writer.cc:273 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Nepavyko susieti %s su %s" + +#: ftparchive/writer.cc:283 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "" + +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "Archyvas neturėjo paketo lauko" + +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s neturi perraÅ¡ymo įraÅ¡o\n" + +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " %s prižiÅ«rėtojas yra %s, o ne %s\n" + +#: ftparchive/writer.cc:620 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:624 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + +#: ftparchive/contents.cc:321 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Vidinė klaida, nepavyko aptikti nario %s" + +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nepavyko iÅ¡skirti atminties" + +#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "Nepavyko atverti %s" + +#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "NekorektiÅ¡kas perraÅ¡ymas %s eilutėje %lu #1" + +#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "NekorektiÅ¡kas perraÅ¡ymas %s eilutėje %lu #2" + +#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "NekorektiÅ¡kas perraÅ¡ymas %s eilutėje %lu #3" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nepavyko nuskaityti perraÅ¡ymo failo %s" + +#: ftparchive/multicompress.cc:72 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Nežinomas suspaudimo algoritmas „%s“" + +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Suspaustai iÅ¡vesčiai %s reikia suspaudimo rinkinio" + +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Nepavyko subprocesui sukurti IPC gijos" + +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" +msgstr "Nepavyko sukurti FILE*" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" +msgstr "" + +#: ftparchive/multicompress.cc:212 +msgid "Compress child" +msgstr "" + +#: ftparchive/multicompress.cc:235 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Vidinė klaida, nepavyko sukurti %s" + +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" +msgstr "Nepavyko sukurti subproceso IPC" + +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "Nepavyko paleisti suspaudėjo " + +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "iÅ¡skleidiklis" + +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" +msgstr "Nepavyko Nusk/Ä®raÅ¡ į subprocesą/failą" + +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" +msgstr "Skaitymo klaida skaičiuojant MD5" + +#: ftparchive/multicompress.cc:472 +#, c-format +msgid "Problem unlinking %s" +msgstr "" + +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Nepavyko pervadinti %s į %s" + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "T" + +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#, c-format +msgid "Regex compilation error - %s" +msgstr "" + +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" +msgstr "Å ie paketai turi neįdiegtų priklausomybių:" + +#: cmdline/apt-get.cc:331 +#, c-format +msgid "but %s is installed" +msgstr "bet %s yra įdiegtas" + +#: cmdline/apt-get.cc:333 +#, c-format +msgid "but %s is to be installed" +msgstr "bet %s bus įdiegtas" + +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "tačiau jis negali bÅ«ti įdiegtas" + +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "bet tai yra virtualus paketas" + +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "bet jis nėra įdiegtas" + +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "bet jis nebus įdiegtas" + +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " arba" + +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "Bus įdiegti Å¡ie NAUJI paketai:" + +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "Bus PAÅ ALINTI Å¡ie paketai:" + +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "Å ių paketų atnaujinimas sulaikomas:" + +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "Bus atnaujinti Å¡ie paketai:" + +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "Bus PAKEISTI SENESNIAIS Å¡ie paketai:" + +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "Bus pakeisti Å¡ie sulaikyti paketai:" + +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (dėl %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 "" +"Ä®spėjimas: Å ie bÅ«tini paketai bus paÅ¡alinti.\n" +"Tai NETURĖTŲ bÅ«ti daroma, kol tiksliai nežinote ką darote!" + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu atnaujinti, %lu naujai įdiegti, " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu įdiegti iÅ¡ naujo, " + +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu pasendinti, " + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu bus paÅ¡alinta ir %lu neatnaujinta.\n" + +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu nepilnai įdiegti ar paÅ¡alinti.\n" + +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "Taisomos priklausomybės..." + +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " nepavyko." + +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "Nepavyko patenkinti priklausomybių" + +#: cmdline/apt-get.cc:676 +#, fuzzy +msgid "Unable to minimize the upgrade set" +msgstr "Nepavyko minimizuoti atnaujinimo rinkinio" + +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " Ä®vykdyta" + +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "Ä®vykdykite „apt-get -f install“, jei norite iÅ¡taisyti Å¡ias klaidas." + +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f." + +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "DĖMESIO: Å ie paketai negali bÅ«ti autentifikuoti!" + +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "" + +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "Ä®diegti Å¡iuos paketus be patvirtinimo [t/N]? " + +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +msgstr "Nepavyko autentikuoti kai kurių paketų" + +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" +msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" + +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" + +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "Reikia paÅ¡alinti paketus, tačiau Å¡alinimas iÅ¡jungtas." + +#: cmdline/apt-get.cc:793 +msgid "Internal error, 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 "Nepavyko užrakinti parsiuntimų aplanko" + +#: 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 "Nepavyko perskaityti Å¡altinių sąraÅ¡o." + +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "Keista.. Dydis neatitinka, ParaÅ¡ykite laiÅ¡ką apt@packages.debian.org" + +#: cmdline/apt-get.cc:839 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Reikia parsiųsti %sB/%sB archyvų.\n" + +#: cmdline/apt-get.cc:842 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Reikia parsiųsti %sB archyvų.\n" + +#: cmdline/apt-get.cc:847 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po Å¡ios operacijos bus naudojama %sB papildomos disko vietos.\n" + +#: cmdline/apt-get.cc:850 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po Å¡ios operacijos bus atlaisvinta %sB disko vietos.\n" + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "Nepavyko nustatyti %s laisvos vietos" + +#: cmdline/apt-get.cc:871 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "%s nėra pakankamai laisvos vietos." + +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" + +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "Taip, daryk kaip liepiu!" + +#: 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 "" +"Bandote atlikti tikėtinai pavojingą veiksmą.\n" +"Jei norite tęsti, įveskite frazę „%s“\n" +" ?] " + +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "Nutraukti." + +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [Y/n]? " +msgstr "Ar norite tęsti [T/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 "Nepavyko parsiųsti %s %s\n" + +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "Nepavyko parsiųsti kai kurių failų" + +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +msgid "Download complete and in download only mode" +msgstr "Pavyko parsiųsti tik parsiuntimo režime" + +#: cmdline/apt-get.cc:1009 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ " +"arba pabandykite su parametru --fix-missing?" + +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "Nepavyko pataisyti dingusių paketų." + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "Diegimas nutraukiamas." + +#: cmdline/apt-get.cc:1053 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Pastaba: pažymimas %s vietoje %s\n" + +#: cmdline/apt-get.cc:1063 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "" +"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" + +#: cmdline/apt-get.cc:1081 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Paketas %s nėra įdiegtas, todėl nebuvo paÅ¡alintas\n" + +#: cmdline/apt-get.cc:1092 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Paketas %s yra virtualus, pateiktas:\n" + +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [Ä®diegtas]" + +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "Reikia pažymėti įdiegimui bent vieną." + +#: 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 "" +"Paketo %s nėra, bet jis nurodytas prie kito paketo.\n" +"Tai gali reikÅ¡ti, kad paketas dingęs, nebenaudojamas \n" +"arba prieinamas tik iÅ¡ kitų Å¡altinių.\n" + +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "Tačiau Å¡ie paketai jį pakeičia:" + +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Paketas %s neturi diegimo kandidatų" + +#: cmdline/apt-get.cc:1156 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" + +#: cmdline/apt-get.cc:1164 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ir taip jau yra naujausias.\n" + +#: cmdline/apt-get.cc:1193 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" + +#: cmdline/apt-get.cc:1195 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Nebuvo rasta „%s“ versija paketui „%s“" + +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Pažymėta versija %s (%s) paketui %s\n" + +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "Atnaujinimo komandai argumentų nereikia" + +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "Nepavyko užrakinti sąraÅ¡o aplanko" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Å ie paketai buvo automatiÅ¡kai įdiegti ir daugiau nebėra reikalingi:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Norėdami juos paÅ¡alinti, paleiskite „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 "" + +#. +#. 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 "Å i informacija gali padėti iÅ¡spręsti Å¡ią situaciją:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1468 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nepavyko rasti užduoties %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#, c-format +msgid "Couldn't find package %s" +msgstr "Nepavyko rasti paketo %s" + +#: cmdline/apt-get.cc:1661 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s nustatytas kaip įdiegtas rankiniu bÅ«du\n" + +#: cmdline/apt-get.cc:1705 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "JÅ«s galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" + +#: cmdline/apt-get.cc:1708 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " +"nurodytų paketų (arba nurodykite iÅ¡eitį)." + +#: 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 "" +"Nepavyko įdiegti kai kurių paketų. Tai gali reikÅ¡ti, kad jÅ«s\n" +"paprašėte neįmanomo dalyko, arba, jei jÅ«s naudojate nestabilų\n" +"leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" +"paÅ¡alinti iÅ¡ \"Incoming\" aplanko." + +#: cmdline/apt-get.cc:1738 +msgid "Broken packages" +msgstr "Sugadinti paketai" + +#: cmdline/apt-get.cc:1767 +msgid "The following extra packages will be installed:" +msgstr "Bus įdiegti Å¡ie papildomi paketai:" + +#: cmdline/apt-get.cc:1856 +msgid "Suggested packages:" +msgstr "SiÅ«lomi paketai:" + +#: cmdline/apt-get.cc:1857 +msgid "Recommended packages:" +msgstr "Rekomenduojami paketai:" + +#: cmdline/apt-get.cc:1885 +msgid "Calculating upgrade... " +msgstr "Skaičiuojami atnaujinimai... " + +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +msgid "Failed" +msgstr "Nepavyko" + +#: cmdline/apt-get.cc:1893 +msgid "Done" +msgstr "Ä®vykdyta" + +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +msgid "Internal error, problem resolver broke stuff" +msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" + +#: cmdline/apt-get.cc:2068 +msgid "Must specify at least one package to fetch source for" +msgstr "BÅ«tina nurodyti bent vieną paketą, kad parsiųsti jo iÅ¡eities tekstą" + +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Nepavyko surasti iÅ¡eities teksto paketo, skirto %s" + +#: cmdline/apt-get.cc:2147 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Praleidžiama jau parsiųsta byla „%s“\n" + +#: cmdline/apt-get.cc:2175 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Neturite pakankamai laisvos vietos %s" + +#: cmdline/apt-get.cc:2181 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Reikia parsiųsti %sB/%sB iÅ¡eities archyvų.\n" + +#: cmdline/apt-get.cc:2184 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Reikia parsiųsti %sB iÅ¡eities archyvų.\n" + +#: cmdline/apt-get.cc:2190 +#, c-format +msgid "Fetch source %s\n" +msgstr "Parsiunčiamas archyvas %s\n" + +#: cmdline/apt-get.cc:2221 +msgid "Failed to fetch some archives." +msgstr "Nepavyko gauti kai kurių arhcyvų." + +#: cmdline/apt-get.cc:2249 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "Jau iÅ¡pakuotas archyvas %s praleidžiama\n" + +#: cmdline/apt-get.cc:2261 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Nepavyko įvykdyti iÅ¡pakavimo komandos „%s“\n" + +#: cmdline/apt-get.cc:2262 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" + +#: cmdline/apt-get.cc:2279 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" + +#: cmdline/apt-get.cc:2298 +msgid "Child process failed" +msgstr "Klaida procese-palikuonyje" + +#: cmdline/apt-get.cc:2314 +msgid "Must specify at least one package to check builddeps for" +msgstr "BÅ«tina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "Nepavyko gauti kÅ«rimo-priklausomybių informacijos paketui %s" + +#: cmdline/apt-get.cc:2362 +#, c-format +msgid "%s has no build depends.\n" +msgstr "" + +#: cmdline/apt-get.cc:2414 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"%s priklausomybė %s paketui negali bÅ«ti patenkinama, nes paketas %s nerastas" + +#: 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 priklausomybė %s paketui negali bÅ«ti patenkinama, nes nėra tinkamos " +"versijos %s paketo" + +#: cmdline/apt-get.cc:2503 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Nepavyko patenkinti %s priklausomybės %s paketui: Ä®diegtas paketas %s yra " +"per naujas" + +#: cmdline/apt-get.cc:2528 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" + +#: cmdline/apt-get.cc:2542 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "" + +#: cmdline/apt-get.cc:2546 +msgid "Failed to process build dependencies" +msgstr "" + +#: cmdline/apt-get.cc:2578 +msgid "Supported modules:" +msgstr "Palaikomi moduliai:" + +#: 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 "" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Imamas " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Gauti:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Ignoruotas " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Klaida " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Parsiųsta %sB iÅ¡ %s (%sB/s)\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [Vykdoma]" + +#: 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 "" +"Laikmenos keitimas: įdėkite diską, pažymėtą\n" +" „%s“,\n" +"į įrenginį „%s“ ir paspauskite enter\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Nežinomas paketo įraÅ¡as!" + +#: 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 "" +"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n" +"\n" +"apt-sortpkgs - tai paprastas įrankis skirtas paketų rÅ«Å¡iavimui. -s nuostata " +"naudojama\n" +"norint nusakyti bylos tipą.\n" +"\n" +"Parametrai:\n" +" -h Å is pagalbos tekstas\n" +" -s Naudoti iÅ¡eities kodo bylos rÅ«Å¡iavimą\n" +" -c=? Nuskaityti Å¡ią konfigÅ«racijos bylą\n" +" -o=? Nurodyti savarankiÅ¡kas nuostatas, pvz.: -o dir::cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Blogi standartiniai nustatymai!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 +msgid "Press enter to continue." +msgstr "Jei norite tęsti, spauskite Enter." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "IÅ¡pakuojant įvyko klaidų. Bandysiu konfigÅ«ruoti" + +#: dselect/install:102 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "paketus, kurie buvo įdiegti. Tai gali sukelti pasikartojančias klaidas" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"arba klaidas, atsiradusias dėl trÅ«kstamų priklausomybių. Viskas gerai, tik " +"klaidos," + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"esančios aukščiau Å¡ios žinutės, yra svarbios. PraÅ¡ome jas iÅ¡taisyti ir vėl " +"paleisti [I]nstall" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Sujungiama turima informaija" + +#: apt-inst/contrib/extracttar.cc:114 +msgid "Failed to create pipes" +msgstr "" + +#: apt-inst/contrib/extracttar.cc:141 +msgid "Failed to exec gzip " +msgstr "" + +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +msgid "Corrupted archive" +msgstr "Sugadintas archyvas" + +#: apt-inst/contrib/extracttar.cc:193 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" + +#: apt-inst/contrib/extracttar.cc:296 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Nežinomas TAR antraÅ¡tės tipas %u. narys %s" + +#: apt-inst/contrib/arfile.cc:70 +msgid "Invalid archive signature" +msgstr "" + +#: apt-inst/contrib/arfile.cc:78 +msgid "Error reading archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +msgid "Invalid archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:128 +msgid "Archive is too short" +msgstr "Archyvas per trumpas" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Failed to read the archive headers" +msgstr "Nepavyko perskaityti archyvo antraščių" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "" + +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "" + +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "" + +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "" + +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#, c-format +msgid "Failed to write file %s" +msgstr "" + +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#, c-format +msgid "Failed to close file %s" +msgstr "" + +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#, c-format +msgid "The path %s is too long" +msgstr "Kelias %s per ilgas" + +#: apt-inst/extract.cc:124 +#, c-format +msgid "Unpacking %s more than once" +msgstr "" + +#: apt-inst/extract.cc:134 +#, c-format +msgid "The directory %s is diverted" +msgstr "" + +#: apt-inst/extract.cc:144 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "" + +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +msgid "The diversion path is too long" +msgstr "" + +#: apt-inst/extract.cc:240 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "" + +#: apt-inst/extract.cc:280 +msgid "Failed to locate node in its hash bucket" +msgstr "" + +#: apt-inst/extract.cc:284 +msgid "The path is too long" +msgstr "Kelias per ilgas" + +#: apt-inst/extract.cc:414 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "" + +#: apt-inst/extract.cc:431 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "" + +#: 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 "Nepavyko perskaityti %s" + +#: apt-inst/extract.cc:491 +#, c-format +msgid "Unable to stat %s" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#, c-format +msgid "Failed to remove %s" +msgstr "Nepavyko paÅ¡alinti %s" + +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#, c-format +msgid "Unable to create %s" +msgstr "Nepavyko sukurti %s" + +#: apt-inst/deb/dpkgdb.cc:114 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:119 +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 +msgid "Reading package lists" +msgstr "Skaitomi paketų sąraÅ¡ai" + +#: apt-inst/deb/dpkgdb.cc:176 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "" + +#: 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 "" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +msgid "Reading file listing" +msgstr "Skaitomas failų sąraÅ¡as" + +#: 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 "" + +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:262 +msgid "Internal error getting a node" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:305 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:320 +msgid "The diversion file is corrupted" +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 "" + +#: apt-inst/deb/dpkgdb.cc:358 +msgid "Internal error adding a diversion" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:379 +msgid "The pkg cache must be initialized first" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:439 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:461 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:466 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: apt-inst/deb/debfile.cc:110 +#, c-format +msgid "Couldn't change to %s" +msgstr "" + +#: apt-inst/deb/debfile.cc:140 +msgid "Internal error, could not locate member" +msgstr "" + +#: apt-inst/deb/debfile.cc:173 +msgid "Failed to locate a valid control file" +msgstr "" + +#: apt-inst/deb/debfile.cc:258 +msgid "Unparsable control file" +msgstr "" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Nepavyko perskaityti cdrom duomenų bazės %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 "" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "Klaidingas CD-ROM" + +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbÅ«t jis vis dar naudojamas." + +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "Diskas nerastas." + +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Failas nerastas" + +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "" + +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Jungiamasi" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Jungiamasi per ilgai" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +msgid "Read error" +msgstr "Skaitymo klaida" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "" + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +msgid "Write error" +msgstr "RaÅ¡ymo klaida" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "" + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "" + +#: 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 "Nepavyko atsiųsti failo, serveris atsakė „%s“" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Užklausti" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "" + +#: methods/connect.cc:70 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Jungiamasi prie %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 "" + +#: methods/connect.cc:96 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "" + +#: methods/connect.cc:104 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko" + +#: methods/connect.cc:119 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Nepavyko prisijungti prie %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 "Jungiamasi prie %s" + +#: methods/connect.cc:165 methods/connect.cc:184 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Nepavyko surasti vardo „%s“" + +#: methods/connect.cc:190 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Laikinas sutrikimas ieÅ¡kant vardo „%s“" + +#: methods/connect.cc:193 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "" + +#: methods/connect.cc:240 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Nepavyko prisijungti prie %s %s:" + +#: methods/gpgv.cc:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" + +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" + +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "" + +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" + +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "Nežinoma klaida kviečiant gpgv" + +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\n" +msgstr "Å ie paraÅ¡ai buvo nevalidÅ«s:\n" + +#: methods/gpgv.cc:257 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "Å ių parašų nebuvo galima patikrinti, nes nėra vieÅ¡ojo rakto:\n" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "" + +#: methods/http.cc:377 +msgid "Waiting for headers" +msgstr "Laukiama antraščių" + +#: methods/http.cc:523 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "" + +#: methods/http.cc:531 +msgid "Bad header line" +msgstr "" + +#: methods/http.cc:550 methods/http.cc:557 +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/http.cc:586 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/http.cc:601 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/http.cc:603 +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/http.cc:627 +msgid "Unknown date format" +msgstr "" + +#: methods/http.cc:774 +msgid "Select failed" +msgstr "" + +#: methods/http.cc:779 +msgid "Connection timed out" +msgstr "Prisijungimo laiko limitas baigėsi" + +#: methods/http.cc:802 +msgid "Error writing to output file" +msgstr "" + +#: methods/http.cc:833 +msgid "Error writing to file" +msgstr "Klaida bandant raÅ¡yti į failą" + +#: methods/http.cc:861 +msgid "Error writing to the file" +msgstr "" + +#: methods/http.cc:875 +msgid "Error reading from server. Remote end closed connection" +msgstr "" + +#: methods/http.cc:877 +msgid "Error reading from server" +msgstr "" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Nepavyko patikrinti %s" + +#: methods/http.cc:1105 +msgid "Bad header data" +msgstr "" + +#: methods/http.cc:1122 methods/http.cc:1177 +msgid "Connection failed" +msgstr "Prisijungti nepavyko" + +#: methods/http.cc:1229 +msgid "Internal error" +msgstr "Vidinė klaida" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:85 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:213 +msgid "Dynamic MMap ran out of room" +msgstr "" + +#: apt-pkg/contrib/strutl.cc:1014 +#, c-format +msgid "Selection %s not found" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:439 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:497 +#, c-format +msgid "Opening configuration file %s" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:662 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "" + +#: apt-pkg/contrib/configuration.cc:681 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:698 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:745 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:758 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:809 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "" + +#: apt-pkg/contrib/progress.cc:153 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Klaida!" + +#: apt-pkg/contrib/progress.cc:155 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Baigta" + +#: apt-pkg/contrib/cmndline.cc:77 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "" + +#: 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 "" + +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#, c-format +msgid "Option %s requires an argument." +msgstr "Parametrui %s reikia argumento." + +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format +msgid "Option '%s' is too long" +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "" + +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "Klaidingas veiksmas %s" + +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +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 +#, c-format +msgid "Unable to change to %s" +msgstr "Nepavyko pakeisti į %s" + +#: apt-pkg/contrib/cdromutl.cc:188 +msgid "Failed to stat the cdrom" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:149 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:154 +#, c-format +msgid "Could not open lock file %s" +msgstr "Nepavyko atverti rakinimo failo %s" + +#: apt-pkg/contrib/fileutl.cc:172 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:176 +#, c-format +msgid "Could not get lock %s" +msgstr "Nepavyko rezervuoti rakinimo failo %s" + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:454 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Procesas %s gavo segmentavimo klaidą" + +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Procesas %s grąžino klaidos kodą (%u)" + +#: apt-pkg/contrib/fileutl.cc:459 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Procesas %s netikėtai išėjo" + +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format +msgid "Could not open file %s" +msgstr "Nepavyko atverti failo %s" + +#: apt-pkg/contrib/fileutl.cc:559 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:589 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:664 +msgid "Problem closing the file" +msgstr "Klaida užveriant failą" + +#: apt-pkg/contrib/fileutl.cc:670 +msgid "Problem unlinking the file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:681 +msgid "Problem syncing the file" +msgstr "Klaida sinchronizuojant failą" + +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "" + +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "" + +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "" + +#: apt-pkg/pkgcache.cc:148 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "" + +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "" + +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "Priklauso" + +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "PrieÅ¡priklauso" + +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "SiÅ«lo" + +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "Rekomenduoja" + +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "Konfliktuoja" + +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "Pakeičia" + +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "Pakeičia" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Sugadina" + +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "Svarbu" + +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "privaloma" + +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "standartinis" + +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "nebÅ«tinas" + +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "papildomas" + +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "Konstruojamas priklausomybių medis" + +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "Galimos versijos" + +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" +msgstr "Priklausomybių generavimas" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Skaitoma bÅ«senos informacija" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "" + +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "" + +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "" + +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:101 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %s" +msgstr "Atveriama %s" + +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "" + +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "" + +#: 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 "" + +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "" + +#: apt-pkg/algorithms.cc:248 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1107 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1109 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" + +#: 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 "" +"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje " +"jų panaudoti seni." + +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "" + +#: apt-pkg/acquire.cc:63 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "" + +#. 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 "Parsiunčiamas %li failas iÅ¡ %li (liko %s)" + +#: apt-pkg/acquire.cc:830 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Parsiunčiamas %li failas iÅ¡ %li" + +#: apt-pkg/acquire-worker.cc:110 +#, c-format +msgid "The method driver %s could not be found." +msgstr "" + +#: apt-pkg/acquire-worker.cc:159 +#, c-format +msgid "Method %s did not start correctly" +msgstr "" + +#: apt-pkg/acquire-worker.cc:399 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Ä®dėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter." + +#: apt-pkg/init.cc:124 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "" + +#: apt-pkg/init.cc:140 +msgid "Unable to determine a suitable packaging system type" +msgstr "" + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "" + +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" + +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Nepavyko perskaityti arba atverti paketų sąraÅ¡o arba bÅ«klės failo." + +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Greičiausiai norėsite paleisti „apt-get update“, kad Å¡ios problemos bÅ«tų " +"iÅ¡taisytos" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" +msgstr "" + +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" +msgstr "" + +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:189 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:193 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:224 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:228 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:232 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:265 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:271 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:299 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:312 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:318 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:690 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:775 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +msgid "IO Error saving source cache" +msgstr "" + +#: apt-pkg/acquire-item.cc:127 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "" + +#: apt-pkg/acquire-item.cc:401 +msgid "MD5Sum mismatch" +msgstr "MD5 sumos neatitikimas" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "MaiÅ¡os sumos nesutapimas" + +#: apt-pkg/acquire-item.cc:1118 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: apt-pkg/acquire-item.cc:1331 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" + +#: apt-pkg/acquire-item.cc:1418 +msgid "Size mismatch" +msgstr "Neatitinka dydžiai" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "" + +#: apt-pkg/cdrom.cc:529 +#, 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 +msgid "Identifying.. " +msgstr "Identifikuojama.. " + +#: apt-pkg/cdrom.cc:563 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Atjungiamas CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Naudojama CD-ROM prijungimo vieta %s\n" + +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "Atjungiamas CD-ROM\n" + +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "Laukiama disko...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "Prijungiamas CD-ROM...\n" + +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Rasta žymė „%s“\n" + +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:760 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Å io disko pavadinimas: \n" +"„%s“\n" + +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "Kopijuojami paketų sąraÅ¡ai..." + +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "RaÅ¡omas naujas Å¡altinių sąraÅ¡as\n" + +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: 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 "" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Ä®diegta %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "KonfigÅ«ruojamas %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Å alinamas %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "TrÅ«ksta aplanko „%s“" + +#: apt-pkg/deb/dpkgpm.cc:605 +#, c-format +msgid "Preparing %s" +msgstr "RuoÅ¡iamas %s" + +#: apt-pkg/deb/dpkgpm.cc:606 +#, c-format +msgid "Unpacking %s" +msgstr "IÅ¡pakuojamas %s" + +#: apt-pkg/deb/dpkgpm.cc:611 +#, c-format +msgid "Preparing to configure %s" +msgstr "RuoÅ¡iamasi konfigÅ«ruoti %s" + +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, c-format +msgid "Processing triggers for %s" +msgstr "Apdorojami %s trigeriai" + +#: apt-pkg/deb/dpkgpm.cc:617 +#, c-format +msgid "Installed %s" +msgstr "Ä®diegta %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 "RuoÅ¡iamasi %s paÅ¡alinimui" + +#: apt-pkg/deb/dpkgpm.cc:628 +#, c-format +msgid "Removed %s" +msgstr "PaÅ¡alintas %s" + +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "RuoÅ¡iamasi visiÅ¡kai paÅ¡alinti %s" + +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format +msgid "Completely removed %s" +msgstr "VisiÅ¡kai paÅ¡alintas %s" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" + +#~ 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 "" +#~ "Kadangi jÅ«s paprašėte tik vienos operacijos, gan tikėtina, kad \n" +#~ "paketas tiesiog negali bÅ«ti įdiegiamas, ir turėtų bÅ«ti užpildytas " +#~ "klaidos\n" +#~ "praneÅ¡imas apie šį paketą." + +#~ msgid "Line %d too long (max %u)" +#~ msgstr "Eilutė %d per ilga (leidžiama %u simbolių)" + +#~ msgid "GPG error: %s: %s" +#~ msgstr "GPG klaida: %s: %s" + +#~ msgid "Apt Authentication issue" +#~ msgstr "Apt autentikacijos problema" + +#~ msgid "Problem during package list update. " +#~ msgstr "Ä®vyko klaida atnaujinant paketų sąrašą. " diff --git a/po/makefile b/po/makefile index 45e5b1e..07dc51c 100644 --- a/po/makefile +++ b/po/makefile @@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot : --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ + # copy into the domain dirs to make rosetta happy + rm -f $(PO)/domains/$*/*.pot + cp $@ $(PO)/domains/$* $(PACKAGE)-all.pot: $(POTFILES) $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@ diff --git a/po/mr.po b/po/mr.po new file mode 100644 index 0000000..860108b --- /dev/null +++ b/po/mr.po @@ -0,0 +1,2926 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: apt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-20 23:27+0530\n" +"Last-Translator: Sampada \n" +"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " +"\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmdline/apt-cache.cc:143 +#, c-format +msgid "Package %s version %s has an unmet dep:\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 शोधण्यास असमर्थ आहे" + +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "पॅकेजची सर्व नांवे: " + +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " सामान्य पॅकेजेस्: " + +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " शुध्द आभासी पॅकेजेस्:" + +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " एकमेव आभासी पॅकेजेस्:" + +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr "मिश्रित आभासी पॅकेजेस्:" + +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " हरवलेले/गहाळ: " + +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "एकूण स्पष्ट आवृत्या: " + +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "एकूण स्पष्ट विवरणे: " + +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "एकूण निर्भरता:" + +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:" + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "एकूण विव/संचिका परस्पर संबंध:" + +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "एकूण मॅपींगस् तरतूद: " + +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " +msgstr "एकूण एकत्रित अक्षरसंच:" + +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " +msgstr "एकूण परावलंबित आवृत्ती अवकाश:" + +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "एकूण दुर्लक्षित अवकाश:" + +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):" + +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." +msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत" + +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल" + +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "पॅकेजेस सापडले नाहीत" + +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +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 "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही" + +#: 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 "एकत्रित पॅकेजेस:" + +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(मिळाले नाही)" + +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr "अधिष्ठापित केले:" + +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(कोणताच नाही)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr "उमेदवार:" + +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr "पॅकेज (पिन):" + +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr "आवृत्ती कोष्टक:" + +#: 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:2575 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s हे %s करिता %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 "" +"वापर: 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" +"ऍप्टच्या द्वयंक कॅश संचिका कौशल्याने हाताळण्यासाठी, व त्यांमधील माहितीची विचारणा " +"करण्यासाठी ऍप्ट -कॅश हे निम्नस्तरीय साधन आहे।\n" +"\n" +"आज्ञावली\n" +" add - उगमस्थान कॅशमध्ये एक पॅकेज संचिका मिळवा \n" +" gencaches - पॅकेज व उगमस्थान कॅश या दोघांची बांधणी करा\n" +" showpkg - एकमेव पॅकेजसाठी काही सामान्य माहिती दाखवा\n" +" showsrc -उगमस्थानाचा माहितीसंच दाखवा\n" +" stats - काही पायाभूत आकडेवारी दाखवा\n" +" dump - संपूर्ण संचिका थोडक्यात दाखवा\n" +" dumpavail - उपलब्ध संचिका stdout मधे छापा\n" +" unmet - पुरी न झालेली परावलंबने दाखवा\n" +" search - regex नमुन्यासाठी पॅकेजची यादी शोधा\n" +" show - पॅकेजसाठी वाचनीय माहितीसंच दाखवा\n" +" depends -पॅकेजसाठी संस्करणपूर्व परावलंबन माहिती दाखवा\n" +" rdepends -पॅकेजसाठी अतिपरावलंबन माहिती दाखवा\n" +" pkgnames - सर्व पॅकेजेससाठी यादी तयार करा\n" +" dotty - GraphViz साठी पॅकेज आलेख निर्माण करा\n" +" xvcg-xvcg साठी पॅकेज आलेख निर्माण करा\n" +" policy - धोरण निर्धारणे दाखवा\n" +"\n" +"पर्याय : \n" +"-h -हा साह्याकारी मजकूर\n" +"-p=? पॅकेज कॅश \n" +"-s=? उगमस्थान कॅश \n" +"-q-प्रगतीनिदर्शक अकार्यान्वित करा \n" +"-i -न आढळलेल्या आज्ञेसाठी महत्त्वाचे विभाग दाखवा\n" +"-c=? ही संरचना संचिका वाचा\n" +"-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n" +"अधिक माहितीसाठी apt-cache(8) and 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 "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)" + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "चलितमूल्य जोडीने नाहीत" + +#: 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 "" +"उपयोग : ऍप्ट-कॉन्फिग(पर्याय) आज्ञा \n" +"\n" +"ऍप्ट कन्फिग संचिता वाचण्यासाठी ऍप्ट-कन्फिग हे एक साधन आहे\n" +"\n" +"आज्ञावली : \n" +"शेल - शेल मोड \n" +"डंप - संरचना दाखवा \n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +" -c= ? ही संरचना संचिका वाचा \n" +" -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s हे वैध डीईबी पॅकेज नाही " + +#: 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 "" +"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" +" \n" +"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" +"डेबियन पॅकेजेस मधून \n" +"\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 मध्ये लिहिण्यास असमर्थ " + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" + +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे" + +#: 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 "त्रुटी प्रक्रिया मार्गदर्शिका%s " + +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" + +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" + +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "त्रुटी प्रक्रिया मजकूर %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 "" +"वापर: apt-ftparchive [options] command\n" +"आज्ञा: 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 डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n" +" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n" +" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n" +"\n" +"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n" +"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n" +" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n" +"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n" +"\n" +"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n" +"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास " +"होतो \n" +"\n" +" 'packages' आणि 'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n" +"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n" +" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n" +" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n" +"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n" +"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +"--md5 MD5 ची निर्मिती नियंत्रित करा \n" +" -s= उगमस्थान ओव्हरराईड संचिका \n" +" -q शांत \n" +" -d= पर्यायी दृतिकादायी डेटाबेस निवडा \n" +" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n" +" ---contents माहिती संचिकेची निर्मिती नियंत्रित करा \n" +" -c=? ही संरचना संचिका वाचा \n" +" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" + +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "निवडक भाग जुळत नाही" + +#: ftparchive/apt-ftparchive.cc:832 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" + +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली" + +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %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 "" +"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " +"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" + +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" + +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 +#, c-format +msgid "Failed to stat %s" +msgstr "%s स्टेट करण्यास असमर्थ" + +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" + +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" +msgstr "संकेतक घेण्यास असमर्थ" + +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n" + +#: ftparchive/writer.cc:81 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n" + +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E:" + +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "धो.सू.:" + +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "ई: संचिकेला लागू होणाऱ्या चुका" + +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#, c-format +msgid "Failed to resolve %s" +msgstr "%s सोडवण्यास असमर्थ" + +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "ट्री चालणे असमर्थ" + +#: ftparchive/writer.cc:195 +#, c-format +msgid "Failed to open %s" +msgstr "%s उघडण्यास असमर्थ" + +#: ftparchive/writer.cc:254 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "%s [%s] डी दुवा\n" + +#: ftparchive/writer.cc:262 +#, c-format +msgid "Failed to readlink %s" +msgstr "%s वाचणारा दुवा असमर्थ" + +#: ftparchive/writer.cc:266 +#, c-format +msgid "Failed to unlink %s" +msgstr "%s दुवा काढण्यास असमर्थ" + +#: ftparchive/writer.cc:273 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "%s चा %s दुवा साधण्यास असमर्थ" + +#: ftparchive/writer.cc:283 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "%sB हीट ची डिलींक मर्यादा\n" + +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "अर्काईव्ह ला पॅकेज जागा नाही" + +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#, c-format +msgid " %s has no override entry\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" + +#: ftparchive/writer.cc:620 +#, c-format +msgid " %s has no source override entry\n" +msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" + +#: ftparchive/writer.cc:624 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" + +#: ftparchive/contents.cc:321 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही" + +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" + +#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "%s उघडण्यास असमर्थ" + +#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" + +#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" + +#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#, c-format +msgid "Malformed override %s line %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 "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" + +#: ftparchive/multicompress.cc:72 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" + +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" + +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" +msgstr "संचिका * तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" +msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:212 +msgid "Compress child" +msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" + +#: ftparchive/multicompress.cc:235 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" +msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "असंकलितकर्ता " + +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" +msgstr "IO ची उपक्रिया/संचिका असमर्थ " + +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" +msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" + +#: ftparchive/multicompress.cc:472 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" + +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "होय" + +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#, c-format +msgid "Regex compilation error - %s" +msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " + +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" +msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" + +#: cmdline/apt-get.cc:331 +#, c-format +msgid "but %s is installed" +msgstr "पण %s संस्थापित झाले" + +#: cmdline/apt-get.cc:333 +#, c-format +msgid "but %s is to be installed" +msgstr "पण %s संस्थापित करायचे आहे" + +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "पण ते संस्थापित करण्याजोगे नाही" + +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "पण ते आभासी पॅकेज आहे" + +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "पण ते संस्थापित केले नाही" + +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "पण ते संस्थापित होणार नाही" + +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr "किंवा" + +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" + +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" + +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "खालील पॅकेजेस परत ठेवली गेली:" + +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" + +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" + +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" + +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (च्या मुळे %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 "" +"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" +"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu पुनर्संस्थापित केले," + +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu मागील आवृत्तीकृत केले," + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" + +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" + +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..." + +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr "अयशस्वी/चूकीचे झाले." + +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे " + +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" +msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ" + +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr "झाले" + +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल." + +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा " + +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " + +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" + +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" + +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" + +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" +msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" + +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!" + +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे" + +#: cmdline/apt-get.cc:793 +msgid "Internal error, 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 "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" + +#: 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 "उगमांच्या याद्या वाचता येणार नाहीत." + +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email 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 "अर्काईव्हजच्या %sB/%sB घेण्याची गरज आहे\n" + +#: cmdline/apt-get.cc:842 +#, c-format +msgid "Need to get %sB of archives.\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" + +#: cmdline/apt-get.cc:850 +#, c-format +msgid "After this operation, %sB disk space will be freed.\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 मध्ये रिकामी जागा सांगू शकत नाही" + +#: cmdline/apt-get.cc:871 +#, c-format +msgid "You don't have enough free space in %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 "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." + +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "हो, मी म्ह्टल्याप्रमाणे करा!" + +#: 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 "" +"तुम्ही संभाव्य काहीतरी नुकसानकारक करणार होतात.\n" +"पुढे '%s' उक्ती मध्ये लिहिणार \n" +" ?] " + +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "व्यत्यय/बंद करा." + +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [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" + +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" + +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +msgid "Download complete and in download only mode" +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 रन करुन अद्ययावत करा किंवा --fix- " +"बरोबर प्रयत्न कराहरवलेले/गहाळ?" + +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ." + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "संस्थापन खंडित करत आहे." + +#: cmdline/apt-get.cc:1053 +#, c-format +msgid "Note, selecting %s instead of %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" + +#: cmdline/apt-get.cc:1081 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" + +#: cmdline/apt-get.cc:1092 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n" + +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr "[संस्थापित केले]" + +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे." + +#: 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 "" +"%s पॅकेज उपलब्ध नाही, पण दुसऱ्या पॅकेजच्या संदर्भाने.\n" +"याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n" +" म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n" + +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:" + +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही" + +#: cmdline/apt-get.cc:1156 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n" + +#: cmdline/apt-get.cc:1164 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" + +#: cmdline/apt-get.cc:1193 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" + +#: cmdline/apt-get.cc:1195 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" + +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" + +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." + +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" + +#: cmdline/apt-get.cc:1435 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 ने काहीतरी नष्ट केल्याचे दिसतेय, खरेतर असे व्हायला नको\n" +"कृपया 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 "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" + +#: cmdline/apt-get.cc:1468 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "%s कार्य सापडू शकले नाही" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#, c-format +msgid "Couldn't find package %s" +msgstr "%s पॅकेज सापडू शकले नाही" + +#: cmdline/apt-get.cc:1661 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " +"लागेल'यात बदल करण्यासाठी:" + +#: 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') पॅकेजशिवाय प्रयत्न करा " +"(किंवा पर्याय सांगा)." + +#: 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 "" +"काही पॅकेजेस संस्थापित होत नाहीत. याचा अर्थ असा आहे की तुम्ही\n" +"अशक्य परिस्थितीची विनंती केली होती. किंवा जर तुम्ही अस्थिर\n" +"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" +"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." + +#: cmdline/apt-get.cc:1738 +msgid "Broken packages" +msgstr "तुटलेली पॅकेजेस" + +#: cmdline/apt-get.cc:1767 +msgid "The following extra packages will be installed:" +msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" + +#: cmdline/apt-get.cc:1856 +msgid "Suggested packages:" +msgstr "सुचवलेली पॅकेजेस:" + +#: cmdline/apt-get.cc:1857 +msgid "Recommended packages:" +msgstr "शिफारस केलेली पॅकेजेस:" + +#: cmdline/apt-get.cc:1885 +msgid "Calculating upgrade... " +msgstr "पुढिल आवृत्तीची गणती करीत आहे..." + +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +msgid "Failed" +msgstr "असमर्थ" + +#: cmdline/apt-get.cc:1893 +msgid "Done" +msgstr "झाले" + +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +msgid "Internal error, problem resolver broke stuff" +msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" + +#: cmdline/apt-get.cc:2068 +msgid "Must specify at least one package to fetch source for" +msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" + +#: 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:2147 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" + +#: cmdline/apt-get.cc:2175 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "%s मध्ये पुरेशी जागा नाही" + +#: 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:2184 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" + +#: cmdline/apt-get.cc:2190 +#, c-format +msgid "Fetch source %s\n" +msgstr "%s उगम घ्या\n" + +#: cmdline/apt-get.cc:2221 +msgid "Failed to fetch some archives." +msgstr "काही अर्काईव्हज आणण्यास असमर्थ." + +#: cmdline/apt-get.cc:2249 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" + +#: cmdline/apt-get.cc:2261 +#, c-format +msgid "Unpack command '%s' failed.\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" + +#: cmdline/apt-get.cc:2279 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" + +#: cmdline/apt-get.cc:2298 +msgid "Child process failed" +msgstr "चाईल्ड प्रक्रिया अयशस्वी" + +#: cmdline/apt-get.cc:2314 +msgid "Must specify at least one package to check builddeps for" +msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" + +#: cmdline/apt-get.cc:2362 +#, c-format +msgid "%s has no build depends.\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 "%s पॅकेज न सापडल्याने %s साठी %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 "" +"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " +"डिपेंडन्सी पूर्ण होऊ शकत नाही" + +#: 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:2530 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" + +#: cmdline/apt-get.cc:2544 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." + +#: cmdline/apt-get.cc:2548 +msgid "Failed to process build dependencies" +msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " + +#: cmdline/apt-get.cc:2580 +msgid "Supported modules:" +msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" + +#: cmdline/apt-get.cc:2621 +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 "" +"वापर: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get हा पॅकेज डाऊनलोड आणि संस्थापित करण्यासाठी साधा आदेश रेखित\n" +" संवादमंच आहे. नेहमी वापरले जाणारे आदेश म्हणजे अपडेट\n" +"आणि संस्थापित करा\n" +"\n" +"आदेश:\n" +" update -पॅकेजच्या नव्या याद्यां प्राप्त करा\n" +" upgrade -आवृत्त्यांचे श्रेणिवर्धन करा\n" +" install -नवीन पॅकेजेस संस्थापित करा(pkg हे libc6 आहे आणि libc6.deb नव्हे)\n" +" remove -पॅकेजेस कायमची काढा\n" +" autoremove - वापरात नसलेली सर्व पॅकेजेस स्वयंचलितपणे कायमची काढा\n" +" purge - पॅकेजेस कायमची काढा व साफ करा\n" +" source -उगमस्थान अर्काईव्हज डाऊनलोड करा\n" +" build-dep - उगमस्थान पॅकेजेससाठी बांधणी-डिपेंडन्सी संरचित करा।\n" +" dist-upgrade - वितरण श्रेणिवर्धन, पहा apt-get(8)\n" +" dselect-upgrade -निवडी रहित करा\n" +" clean - डाऊनलोड केलेल्या अर्काईव्हज फाईल्स खोडून टाका\n" +" autoclean - डाऊनलोड केलेल्या जुन्या अर्काईव्हज फाईल्स खोडून टाका\n" +" check - डिपेन्डन्सीज तुटलेल्या नाहीत याची खात्री करा\n" +"\n" +"पर्याय:\n" +" -h हा मदत मजकूर.\n" +" -q नोंद करण्यासारखे आऊटपुट-प्रगती निदर्शक नाही\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),आणि\n" +" apt.conf(5) पुस्तिका पाने पहा.\n" +" ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "दाबा" + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "मिळवा:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "आय.जी.एन." + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "दोष इ.आर.आर." + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%s (%sB/s) मध्ये %sB मिळविला\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr "[काम करत आहे]" + +#: 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 "" +"माध्यम बदल: कृपया नाव घातलेली सीडी घाला\n" +"%s'\n" +"'%s' ड्राईव्ह मध्ये व एंटर कळ दाबा\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "अनोळखी पॅकेज माहिती संच!" + +#: 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 "" +"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n" +"\n" +" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s पर्याय हा " +"फाईल\n" +"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n" +"\n" +"पर्याय\n" +" -h हा मदत मजकूर\n" +" -s उगमस्थान फाईल वापरा\n" +" -c=? ही संरचना फाईल वाचा\n" +" -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +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 "पुढे जाण्यासाठी एंटर दाबा." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "पुर्वी डाऊनलोड केलेल्या .deb संचयिका आपल्याला खोडून टाकायच्या आहेत का?" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "काही त्रुटी ह्या उघडत असताना घडल्या.मी संरचित करणार आहे" + +#: dselect/install:102 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "पॅकेजेस जी संस्थापित झाली आहे.याचा निकाल दुप्पट त्रुटी म्हणून होऊ शकतो" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "किंवा डिपेंडन्सीज नसल्यामुळे त्रुटी झाल्या. हे ठीक आहे, फक्त त्रुटी" + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"ह्यावर संदेश खूप महत्त्वाचे आहेत.कृपया त्यांना नीट करा व संस्थापित करा पुन्हा चालवा/सुरू करा" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे" + +#: apt-inst/contrib/extracttar.cc:114 +msgid "Failed to create pipes" +msgstr "पाईप तयार करण्यास असमर्थ" + +#: apt-inst/contrib/extracttar.cc:141 +msgid "Failed to exec gzip " +msgstr "exec gzip करण्यास असमर्थ" + +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +msgid "Corrupted archive" +msgstr "बिघडलेली अर्काईव्हज" + +#: apt-inst/contrib/extracttar.cc:193 +msgid "Tar checksum failed, archive corrupted" +msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" + +#: apt-inst/contrib/extracttar.cc:296 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" + +#: apt-inst/contrib/arfile.cc:70 +msgid "Invalid archive signature" +msgstr "अयोग्य अर्काईव्ह ओळख सही" + +#: apt-inst/contrib/arfile.cc:78 +msgid "Error reading archive member header" +msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी" + +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +msgid "Invalid archive member header" +msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" + +#: apt-inst/contrib/arfile.cc:128 +msgid "Archive is too short" +msgstr "अर्काईव्ह खूप छोटे आहे" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Failed to read the archive headers" +msgstr "अर्काईव्ह शीर्षके वाचणे असफल" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष" + +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s" + +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा" + +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "%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 "%s फाईल मध्ये लिहिण्यास असमर्थ" + +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#, c-format +msgid "Failed to close file %s" +msgstr "%s फाईल बंद करण्यास असमर्थ" + +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#, c-format +msgid "The path %s is too long" +msgstr "मार्ग %s हा खूप लांब आहे" + +#: apt-inst/extract.cc:124 +#, c-format +msgid "Unpacking %s more than once" +msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे" + +#: apt-inst/extract.cc:134 +#, c-format +msgid "The directory %s is 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 मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे" + +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +msgid "The diversion path is too long" +msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" + +#: apt-inst/extract.cc:240 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे" + +#: apt-inst/extract.cc:280 +msgid "Failed to locate node in its hash bucket" +msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ" + +#: apt-inst/extract.cc:284 +msgid "The path is too long" +msgstr "मार्ग खूप लांब आहे" + +#: apt-inst/extract.cc:414 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही" + +#: apt-inst/extract.cc:431 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "File %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 वाचण्यास असमर्थ" + +#: apt-inst/extract.cc:491 +#, c-format +msgid "Unable to stat %s" +msgstr "%s स्टॅट करण्यास असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#, c-format +msgid "Failed to remove %s" +msgstr "%s कायमचे काढून टाकण्यास असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#, c-format +msgid "Unable to create %s" +msgstr "%s तयार करण्यास असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:114 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "% sinfo स्टॅट करण्यास असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:119 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे" + +#. 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 "पॅकेज याद्या वाचत आहोत" + +#: apt-inst/deb/dpkgdb.cc:176 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "admin dir %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 "पॅकेजचे नाव मिळवत असताना आंतरिक दोष/त्रुटी मिळाली" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +msgid "Reading file listing" +msgstr "फाईलचे लिस्टिंग वाचत आहे" + +#: 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 "" +"'%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 फाईल यादी वाचण्यास असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:262 +msgid "Internal error getting a node" +msgstr "नोड मिळवताना आंतरिक त्रुटी मिळाली" + +#: apt-inst/deb/dpkgdb.cc:305 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "%sdiversions ही डायव्हर्जन फाईल उघडण्यात असमर्थ" + +#: apt-inst/deb/dpkgdb.cc:320 +msgid "The diversion file is corrupted" +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 डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:" + +#: apt-inst/deb/dpkgdb.cc:358 +msgid "Internal error adding a diversion" +msgstr "डायव्हर्जन मिळवताना आंतरिक त्रुटी मिळाली" + +#: apt-inst/deb/dpkgdb.cc:379 +msgid "The pkg cache must be initialized first" +msgstr "pkg अस्थाई स्मृतीकोष प्रथम इनिशिअलाईज्ड केला पाहिजे" + +#: apt-inst/deb/dpkgdb.cc:439 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "पॅकेज शोधण्यास असमर्थ: शिर्षक,आॅफसेट %lu" + +#: apt-inst/deb/dpkgdb.cc:461 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "आॅफसेट %lu, सद्यस्थिती फाईलमध्ये वाईट कॉन्फ फाईल भाग" + +#: apt-inst/deb/dpkgdb.cc:466 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "ऑफसेट %lu, MD5. पार्सिंग मध्ये त्रुटी " + +#: 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' मेंबर उपलब्ध नाही" + +#: 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' मेंबर नाही" + +#: apt-inst/deb/debfile.cc:110 +#, c-format +msgid "Couldn't change to %s" +msgstr "%s मध्ये बदलता येत नाही" + +#: apt-inst/deb/debfile.cc:140 +msgid "Internal error, could not locate member" +msgstr "आंतरिक त्रुटी, मेंबर शोधता येत नाही" + +#: apt-inst/deb/debfile.cc:173 +msgid "Failed to locate a valid control file" +msgstr "वैध नियंत्रण फाईल शोधण्यास असमर्थ" + +#: apt-inst/deb/debfile.cc:258 +msgid "Unparsable control file" +msgstr "अनपार्सेबल नियंत्रण फाईल" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %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 कडून ओळखण्यासाठी apt-cdrom चा वापर करा.apt-get update हे " +"नवीन सीडी राॅम अधिक मिळवण्यासाठी वापरता येणार नाही" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "चूकीची सी-डी रॉम" + +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "%s मधील सीडी-रॉम अनमाऊंट करण्यास असमर्थ, अजूनही ते वापरता असेल." + +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "डिस्क सापडत नाही" + +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "फाईल सापडली नाही" + +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "स्टॅट करण्यास असमर्थ" + +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "लॉग इन करत आहे" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "स्थानिक नाव सांगण्यास असमर्थ" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन " +"निरर्थक आहे." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "वेळेअभावी संबंध जोडता येत नाही" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "सर्व्हरने संबंध जोडणी बंद केली" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +msgid "Read error" +msgstr "त्रुटी वाचा" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "प्रतिसाधाने बफर भरुन गेले." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "प्रोटोकॉल खराब झाले" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +msgid "Write error" +msgstr "लिहिण्यात त्रुटी" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "सॉकेट तयार करू शकत नाही" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "पॅसिव्ह सॉकेट जोडता येत नाही" + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "सॉकेट चिकटवता येत नाही" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "सॉकेट वर ऐकता येत नाही" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "सॉकेटचे नाव सांगता येत नाही" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "जोडणी स्विकारण्यास असमर्थ" + +#: 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 सांगितले, फाईल मिळवण्यास असमर्थ" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "डेटा सॉकेट वेळेअभावी तुटले" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "प्रश्न" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "जारी करण्यास करण्यास असमर्थ" + +#: methods/connect.cc:70 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "%s (%s) ला जोडत आहे" + +#: methods/connect.cc:81 +#, c-format +msgid "[IP: %s %s]" +msgstr "[आयपी:%s %s]" + +#: methods/connect.cc:90 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "%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). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही" + +#: methods/connect.cc:104 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली" + +#: methods/connect.cc:119 +#, c-format +msgid "Could not connect to %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 ला जोडत आहे" + +#: methods/connect.cc:165 methods/connect.cc:184 +#, c-format +msgid "Could not resolve '%s'" +msgstr "%s रिझॉल्व्ह होऊ शकत नाही " + +#: methods/connect.cc:190 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" + +#: methods/connect.cc:193 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" + +#: methods/connect.cc:240 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "%s %s ला जोडण्यास असमर्थ:" + +#: methods/gpgv.cc:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" + +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे." + +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" + +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "किमान एक अवैध सही सापडली." + +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" +"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" + +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" + +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\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" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "%s साठी पाईप उघडता येत नाही" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "%s क्रियेपासून चूक वाचा" + +#: methods/http.cc:377 +msgid "Waiting for headers" +msgstr "शीर्षकासाठी थांबले आहे...." + +#: methods/http.cc:523 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली" + +#: methods/http.cc:531 +msgid "Bad header line" +msgstr "वाईट शीर्षक ओळ" + +#: methods/http.cc:550 methods/http.cc:557 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले" + +#: methods/http.cc:586 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले " + +#: methods/http.cc:601 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले" + +#: methods/http.cc:603 +msgid "This HTTP server has broken range support" +msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली" + +#: methods/http.cc:627 +msgid "Unknown date format" +msgstr "अपरिचित दिनांक प्रकार/स्वरूप " + +#: methods/http.cc:774 +msgid "Select failed" +msgstr "चुकले/असमर्थ निवड करा" + +#: methods/http.cc:779 +msgid "Connection timed out" +msgstr "जोडणी वेळेअभावी तुटली" + +#: methods/http.cc:802 +msgid "Error writing to output file" +msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" + +#: methods/http.cc:833 +msgid "Error writing to file" +msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" + +#: methods/http.cc:861 +msgid "Error writing to the file" +msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" + +#: methods/http.cc:875 +msgid "Error reading from server. Remote end closed connection" +msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" + +#: methods/http.cc:877 +msgid "Error reading from server" +msgstr "सर्व्हर मधून वाचण्यात चूक" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "फाईल छोटी करणे असफल" + +#: methods/http.cc:1105 +msgid "Bad header data" +msgstr "चुकीचा शीर्षक डाटा" + +#: methods/http.cc:1122 methods/http.cc:1177 +msgid "Connection failed" +msgstr "जोडणी अयशस्वी" + +#: methods/http.cc:1229 +msgid "Internal error" +msgstr "अंतर्गत त्रुटी" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" +msgstr "रिकामी फाईल mmap करता येणार नाही" + +#: apt-pkg/contrib/mmap.cc:85 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" + +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 +#, c-format +msgid "Selection %s not found" +msgstr "%s निवडक भाग सापडत नाही" + +#: apt-pkg/contrib/configuration.cc:439 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'" + +#: apt-pkg/contrib/configuration.cc:497 +#, c-format +msgid "Opening configuration file %s" +msgstr "%s संरचना फाईल उघडत आहे" + +#: apt-pkg/contrib/configuration.cc:662 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो." + +#: apt-pkg/contrib/configuration.cc:681 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग" + +#: apt-pkg/contrib/configuration.cc:698 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +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: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात" + +#: apt-pkg/contrib/configuration.cc:745 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +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: ह्या पासून समाविष्ट " + +#: apt-pkg/contrib/configuration.cc:758 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%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: फाईलच्या अंती अधिक जंक" + +#: apt-pkg/contrib/progress.cc:153 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... चूक/त्रुटी!" + +#: apt-pkg/contrib/progress.cc:155 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... झाले" + +#: apt-pkg/contrib/cmndline.cc:77 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +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 नीट समजला नाही" + +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही" + +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#, c-format +msgid "Option %s requires an argument." +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: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>." + +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको" + +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format +msgid "Option '%s' is too long" +msgstr "'%s' पर्याय खूप लांब आहे" + +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा." + +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "%s अवैध क्रिया" + +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +msgid "Unable to stat the mount point %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 मध्ये बदलण्यास असमर्थ" + +#: apt-pkg/contrib/cdromutl.cc:188 +msgid "Failed to stat the cdrom" +msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" + +#: apt-pkg/contrib/fileutl.cc:149 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" + +#: apt-pkg/contrib/fileutl.cc:154 +#, c-format +msgid "Could not open lock file %s" +msgstr "%s कुलूप फाईल उघडता येत नाही" + +#: apt-pkg/contrib/fileutl.cc:172 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" + +#: apt-pkg/contrib/fileutl.cc:176 +#, c-format +msgid "Could not get lock %s" +msgstr "%s कुलुप मिळवता येत नाही" + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "%s साठी थांबलो पण ते तेथे नव्हते" + +#: apt-pkg/contrib/fileutl.cc:454 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." + +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" + +#: apt-pkg/contrib/fileutl.cc:459 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" + +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format +msgid "Could not open file %s" +msgstr "%s फाईल उघडता येत नाही" + +#: apt-pkg/contrib/fileutl.cc:559 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" + +#: apt-pkg/contrib/fileutl.cc:589 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" + +#: apt-pkg/contrib/fileutl.cc:664 +msgid "Problem closing the file" +msgstr "फाईल बंद करण्यात अडचण" + +#: apt-pkg/contrib/fileutl.cc:670 +msgid "Problem unlinking the file" +msgstr "फाईल अनलिंकिंग करण्यात अडचण" + +#: apt-pkg/contrib/fileutl.cc:681 +msgid "Problem syncing the file" +msgstr "संचिकेची syncing समस्या" + +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "पॅकेज अस्थाई स्मृतिकोष" + +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" + +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे" + +#: apt-pkg/pkgcache.cc:148 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही" + +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला" + +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "अवलंबित" + +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "पूर्व अवलंबित" + +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "सुचवणे" + +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "शिफारस" + +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "परस्परविरोध" + +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "परत त्याठिकाणी आणा" + +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "अप्रचलित" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "तोडले" + +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "अत्यावश्यक" + +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "आवश्यक" + +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "मानक" + +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "एच्छिक" + +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "अधिक" + +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "अवलंबित रचना बांधणी करत आहे" + +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "कंॅडिडेट आवृत्त्या" + +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" +msgstr "अवलंबित/विसंबून असलेले उत्पादन " + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "स्थिती माहिती वाचत आहे" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "%s StateFile उघडणे असफल" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" + +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" + +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:101 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %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 "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." + +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " + +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा " + +#: 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 "" +"ह्याचे आधिष्ठापन सुरु करण्यासाठी अत्यावश्यक तात्पुरते काढुन टाकण्याची गरज आहे%s पॅकेज " +"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " +"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा." + +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" +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 पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." + +#: apt-pkg/algorithms.cc:1107 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " +"पॅकेजेस असू शकते." + +#: apt-pkg/algorithms.cc:1109 +msgid "Unable to correct problems, you have held broken packages." +msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." + +#: 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 "" +"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " +"त्याऐवजी जुन्या वापरल्या गेल्या." + +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "संचयिका यादीत %s पार्शल हरवले आहे." + +#: apt-pkg/acquire.cc:63 +#, c-format +msgid "Archive directory %spartial is missing." +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 राहिलेले) संचिका पुन:प्राप्त करीत आहे" + +#: apt-pkg/acquire.cc:830 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" + +#: apt-pkg/acquire-worker.cc:110 +#, c-format +msgid "The method driver %s could not be found." +msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. " + +#: apt-pkg/acquire-worker.cc:159 +#, c-format +msgid "Method %s did not start correctly" +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' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." + +#: apt-pkg/init.cc:124 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही" + +#: apt-pkg/init.cc:140 +msgid "Unable to determine a suitable packaging system type" +msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ " + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "%s स्टॅट करण्यात असमर्थ. " + +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला" + +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही." + +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" +msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " + +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" +msgstr "%s पिनचा प्रकार समजलेला नाही" + +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" + +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे" + +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "%s (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "%s (NewFileDesc1) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली" + +#: apt-pkg/pkgcachegen.cc:189 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)" + +#: apt-pkg/pkgcachegen.cc:193 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:224 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:228 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:232 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "%s(नविन आवृती२) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली " +"आहे." + +#: apt-pkg/pkgcachegen.cc:265 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे." + +#: apt-pkg/pkgcachegen.cc:271 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " +"ओलांडली आहे." + +#: apt-pkg/pkgcachegen.cc:299 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:312 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:318 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " + +#: apt-pkg/pkgcachegen.cc:690 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" + +#: apt-pkg/pkgcachegen.cc:775 +msgid "Collecting File Provides" +msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" + +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +msgid "IO Error saving source cache" +msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" + +#: apt-pkg/acquire-item.cc:127 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:401 +msgid "MD5Sum mismatch" +msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "हॅश बेरीज जुळत नाही" + +#: apt-pkg/acquire-item.cc:1118 +msgid "There is no public key available for the following key IDs:\n" +msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\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 पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " +"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " + +#: 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 पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " +"स्थिर/निश्चित करण्याची गरज आहे." + +#: apt-pkg/acquire-item.cc:1331 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" +"ठिकाण %s." + +#: apt-pkg/acquire-item.cc:1418 +msgid "Size mismatch" +msgstr "आकार जुळतनाही" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" + +#: apt-pkg/cdrom.cc:529 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"सिडी-रॉमचे माउंट स्थान %s वापरुन\n" +"सिडी-रॉम माउंट होत आहे\n" + +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "ओळखत आहे.." + +#: apt-pkg/cdrom.cc:563 +#, c-format +msgid "Stored label: %s\n" +msgstr "ग्रहण केलेले नामदर्शक: %s \n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:590 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" + +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "सिडी-रॉम अनमाउंट करत आहे\n" + +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "सिडी-रॉम माउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\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" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "'%s' लेबल सापडले\n" + +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न करा.\n" + +#: apt-pkg/cdrom.cc:760 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"ह्या डिस्कला/चकतीला: म्हणतात\n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." + +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "नविन स्त्रोत सूची लिहित आहे\n" + +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" +msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" + +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#, c-format +msgid "Wrote %i records.\n" +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" + +#: 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" + +#: 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" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "%s संस्थापित होत आहे" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s संरचित होत आहे" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s काढून टाकत आहे" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "'%s' संचयिका गहाळ आहे" + +#: apt-pkg/deb/dpkgpm.cc:605 +#, c-format +msgid "Preparing %s" +msgstr "%s तयार करित आहे" + +#: apt-pkg/deb/dpkgpm.cc:606 +#, c-format +msgid "Unpacking %s" +msgstr "%s सुटे/मोकळे करीत आहे " + +#: apt-pkg/deb/dpkgpm.cc:611 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s संरचने साठी तयार करत आहे" + +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, c-format +msgid "Processing triggers for %s" +msgstr "%s करिता ट्रिगर्स प्रक्रिया करत आहे" + +#: apt-pkg/deb/dpkgpm.cc:617 +#, c-format +msgid "Installed %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 ला काढून टाकण्यासाठी तयारी करत आहे" + +#: apt-pkg/deb/dpkgpm.cc:628 +#, c-format +msgid "Removed %s" +msgstr "%s काढून टाकले" + +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" + +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format +msgid "Completely removed %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" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "फाईल पॅच करता आली नाही" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "जोडणी अकाली बंद झाली" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "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 "" +#~ "जेव्हा तुम्ही एका क्रियेची विनंती केली तेव्हा असं की\n" +#~ "ते पॅकेज संस्थापित होऊ शकत नाही आणि त्याच्या विरूद्ध \n" +#~ "दोष आढाव्याची नोंद ठेवली पाहिजे." + +#, 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(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#, 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" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "चुकले/असमर्थ निवड करा" diff --git a/po/nb.po b/po/nb.po index 3a32160..79f1c63 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,22 +1,20 @@ -# Norsk bokmalsoversettelse av meldinger i APT." -# Copyright 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug -# Filen utgis under Gnu Public License version 2. -# Lisensen er tilgjenglig fra http://www.gnu.org/licenses/gpl.txt +# Norsk Bokmal translation of messages in APT. +# +# The file is available under Gnu Public License version 2. +# Get the license from http://www.gnu.org/licenses/gpl.txt +# Copyright: # Lars Bahner , 2002-2003. -# Axel Bojer , 2003. -# Hans Fredrik Nordhaug , 2003. -# Klaus Ade Johnstad , 2004. +# Axel Bojer , 2003-2004. # Klaus Ade Johnstad , 2004. -# Axel Bojer , 2004. # Bjorn Steensrud , 2004. -# Hans Fredrik Nordhaug , 2005-2006. +# Hans Fredrik Nordhaug , 2003, 2005-2008. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-16 00:35+0100\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-17 02:07+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -24,146 +22,154 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Klarer ikke å finne pakken %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Plassmengde pakkenavn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Vanlige pakker: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Rent virtuelle pakker: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakker: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Sammensatte virtuelle pakker: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Mangler: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Antall unike versjoner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Antall unike beskrivelser: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Antall avhengighetsforhold: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Antall forhold versjon/fil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Antall forhold beskrivelse/fil: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Antall tilbudte tilknyttinger: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Antall utvidede strenger: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total plass for avhengighetsforhold/versjoner: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Plass brukt av slark: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du må oppgi nøyaktig ett mønster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Låste pakker:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikke funnet)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke låst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s for %s %s kompilert på %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s for %s kompilert på %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -186,8 +192,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -209,7 +215,7 @@ msgstr "" "apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine binære\n" "lagerfiler, og spørre dem om informasjon.\n" "\n" -"Ordrer:\n" +"Kommandoer:\n" " add - Legg en fil til kildelageret\n" " gencaches - Bygg lagrene for både pakke og kildekode\n" " showpkg - Vis overordnet informasjon om en enkelt pakke\n" @@ -223,8 +229,8 @@ msgstr "" " depends - Vis rå informasjon om avhengighetsforholdene for pakken\n" " rdepends - Vis informasjon om de reverserte avhengighetsforholdene for " "pakken\n" -" pkgnames - List alle pakkenavn\n" -" dotty - Lag pakke-grafer for GraphVis\n" +" pkgnames - List alle pakkenavn på systemet\n" +" dotty - Lag pakke-grafer for GraphViz\n" " xvcg - Lag pakke-grafer for xvcg\n" " policy - Vis regelinnstillingerr\n" "\n" @@ -273,7 +279,7 @@ msgstr "" "\n" "apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n" "\n" -"Ordrer:\n" +"Kommandoer:\n" " shell - Skallmodus\n" " dump - Vis innstillingene\n" "\n" @@ -312,7 +318,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -321,31 +327,31 @@ msgstr "Kan ikke skrive til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -386,8 +392,8 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Bruk: apt-ftparchive [innstillinger] ordre\n" -"Ordrer: packages binærsti [overstyringsfil [sti-prefiks]]\n" +"Bruk: apt-ftparchive [innstillinger] kommando\n" +"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n" " sources kildesti [overstyringsfil [sti-prefiks]]\n" " contents sti\n" " release sti\n" @@ -399,8 +405,7 @@ msgstr "" "erstatninger for dpkg-scanpackages og dpkg-scansources.\n" "\n" "apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n" -"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg " -"til\n" +"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg til\n" "MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n" "gjennom verdier for prioritet og kategori.\n" "\n" @@ -427,26 +432,26 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkårlig innstilling" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ingen utvalg passet" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa «%s»" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsøker å oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -454,278 +459,278 @@ msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " "fjern og så gjenopprett databasen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke å åpne Databasefila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Klarte ikke å få statusen på %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Klarte ikke å finne en peker" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke å lese katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke å få statusen på %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "F:" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A:" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke å slå opp %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Klarte ikke å finne fram i treet" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke å lese lenken %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke å oppheve lenken %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke å lenke %s til %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %s B er nådd.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppføring\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppføring\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binæroverstyringsoppføring heller\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fant ikke medlemmet %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke å tildele minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikke å åpne %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Ugyldig overstyring %s linje %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikke å lese overstyringsfila %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjent komprimeringsalgoritme «%s»" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s trenger et komprimeringssett" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Klarte ikke å opprette FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Klarte ikke å forgreine prosess" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Komprimer barneprosess" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke å opprette underprosessen IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Klarte ikke å kjøre komprimeringen" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "dekomprimering" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "men er ikke installert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -733,146 +738,146 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Retter på avhengighetsforhold ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Klarer ikke å rette på avhengighetsforholdene" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke å minimere oppgraderingsettet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Utført" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsadvarsel overstyrt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges å fjernes, men funksjonen er slått av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullførte ikke" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Kan ikke lese kildlista." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Så rart ... Størrelsene stemmer ikke overens, send en e-post til " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må hente %sB/%sB med arkiver.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må hente %sB med arkiver.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ja, gjør som jeg sier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -883,77 +888,77 @@ msgstr "" "For å fortsette skriv inn teksten «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Klarte ikke å skaffe %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " -"«--fix-missing»." +"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller «--" +"fix-missing»." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og bytte av media støttes nå ikke" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Klarer ikke å rette på manglende pakker." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Du må velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,75 +969,117 @@ msgstr "" "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Følgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Kan ikke låse listemappa" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Bruk «apt-get autoremove» for å fjerne dem." + +#: 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 "" -"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " -"ble brukt isteden. " +"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n" +"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne." + +#. +#. 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 "Følgende informasjon kan være til hjelp med å løse problemet:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Klarte ikke å finne oppgave %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s satt til manuell installasjon.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1040,7 +1087,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1052,136 +1099,122 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1569 -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 "" -"Ettersom du bare bestilte et enkelt inngrep er det overveiende sannsynlig\n" -"at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " -"feilmelding." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemløser ødela noe" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Du må angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgår utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken «dpkg-dev» er installert.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1190,32 +1223,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1230,6 +1263,8 @@ msgid "" " 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" @@ -1245,7 +1280,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1260,15 +1295,17 @@ msgstr "" " apt-get [innstillinger] install|remove pakke1 [pakke2 ...]\n" " apt-get [innstillinger] source pakke1 [pakke2 ...]\n" "\n" -"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja for å " -"laste ned og\n" -"installere pakker. De kommandoene som brukes mest er «update» og «install».\n" +"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n" +"for å laste ned og installere pakker. De mest brukte kommandoene \n" +"er «update» og «install».\n" "\n" -"Ordrer:\n" +"Kommandoer:\n" " update - Hent nye pakkelister\n" " upgrade - Utfør en oppgradering\n" -" install - Installér nye pakker (Bruk pakkenavn - ikke filnavn (foo.deb))\n" +" install - Installér nye pakker (Pakke er «foo», ikke «foo.deb»)\n" " remove - Fjern pakker\n" +" autoremove - Fjern alle automatisk ubrukte pakker\n" +" purge - Fjern og rydd opp etter pakker\n" " source - Last ned kildekode fra arkivene\n" " build-dep - Sett opp bygge-forutsetninger for kildekodepakker\n" " dist-upgrade - Oppgradér utgave, les apt-get(8)\n" @@ -1291,7 +1328,7 @@ msgstr "" " -V Vis fullstendige versjonsnummere\n" " -c=? Les denne innstillingsfila\n" " -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" -"Les manualsiden apt-get(8), sources.list(5) and apt.conf(5)\n" +"Les manualsiden apt-get(8), sources.list(5) og apt.conf(5)\n" "for mer informasjon og flere innstillinger\n" " Denne APT har kraften til en Superku.\n" @@ -1364,27 +1401,31 @@ msgstr "" msgid "Bad default setting!" msgstr "Feil standardinnstilling!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Trykk «Enter» og fortsett" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?" + # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Feil oppsto ved utpakkinga. Setter nå opp de installerte pakkene." -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "Det kan lede til fordobling av feil eller feil forårsaket av " -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "manglende forutsetninger. Det er greit, bare de nevnte feilene er" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen." @@ -1393,189 +1434,189 @@ msgstr "av betydning. Sett dem i stand dem og kj msgid "Merging available information" msgstr "Fletter tilgjengelig informasjon" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Klarte ikke å opprette rør" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Klarte ikke å kjøre gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Ødelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Klarte ikke å lese arkivhodene" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode ble startet på et knutepunkt som ennå er lenket" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fant ikke nøkkelelementet." -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikke å tildele avledning" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tillegging av avledning %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakker ut %s mer enn en gang" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avledet" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prøver å skrive til avledningsmålet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Avledningsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Fant ikke knutepunktet i dens hash-spann" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriver over pakketreff uten versjon for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Klarer ikke å lese %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikke å få statusen på %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Klarte ikke å fjerne %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Klarte ikke å opprette %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Klarte ikke å få statusen på %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Leser pakkelister" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Klarte ikke å bytte til adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Intern feil ved henting av pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Les filliste" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1586,78 +1627,79 @@ msgstr "" "denne fila, bør du opprette den som en tom fil og installere den samme " "versjonen av pakken på nytt." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Klarte ikke å lese listefila %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern feil ved henting av node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Klarte ikke å åpne avledningsfila %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Avledningsfila er ødelagt" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ugyldig linje i avledningsfila: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Det oppsto en intern feil når avledningen ble lagt til" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakkelageret må klargjøres først" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Fant ikke «Package:»-linje, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Ødelagt «ConfFile»-del i statusfila. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Feil ved tolking av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»- eller «%s»-medlem" +"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller «%s»-" +"medlem" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Klarte ikke å bytte til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Intern feil, fant ikke medlem" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Fant ingen gyldig kontrollfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Kontrollfila kan ikke tolkes" @@ -1671,35 +1713,34 @@ 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 "" -"Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan " -"ikke bruke «apt-get update» til å legge til nye CD-plater." +"Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan ikke " +"bruke «apt-get update» til å legge til nye CD-plater." #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Feil CD-plate" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarer ikke å avmontere CD-plata i %s. Det kan hende plata fremdeles er i " "bruk." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Klarte ikke å få status" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -1761,7 +1802,7 @@ msgstr "Tidsavbrudd p msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1773,7 +1814,7 @@ msgstr "Et svar oversv msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1827,7 +1868,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1854,59 +1895,59 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikke å starte" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Kobler til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikke å koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke å slå opp «%s»" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av «%s»" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikke å koble til %s %s:" @@ -1916,34 +1957,34 @@ msgstr "Klarte ikke msgid "Couldn't access keyring: '%s'" msgstr "Klarte ikke å slå opp i nøkkelring; «%s»" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Klarte ikke kjøre «%s» for å verifisere signaturen (er gnupg installert?)" +"Klarte ikke kjøre «%s» for å verifisere signaturen (er gpgv installert?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjøring av gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "De følgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1961,427 +2002,452 @@ msgstr "Klarte ikke msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Venter på hoder" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Ødelagt hodelinje" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Klarte ikke forkorte fila %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Intern feil" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Kan ikke utføre mmap på en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: «%c»" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Åpner oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linje %d er for lang (maks %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil på taggen" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Skjønner ikke kommandolinjevalget %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valget %s krever et argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valget %s må ha et heltallsargument, ikke «%s»" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valget «%s» er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjønner ikke %s. Prøv «true» eller «false»." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarer ikke å fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Klarer ikke å endre %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Klarer ikke å få statusen på CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke åpne låsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Får ikke låst %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke åpne fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem ved låsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkens lagerfil er ødelagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT støtter ikke versjonssystemet «%s»" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Avhenger av" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forutsetter" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslår" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefaler" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Er i konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Nuller" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Ødelegger" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "påkrevet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanlig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valgfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Leser tilstandsinformasjon" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Klarte ikke å åpne StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Klarte ikke å skrive midlertidig StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil på %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil på %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil på %u i kildelista %s (selgers id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2392,19 +2458,19 @@ msgstr "" "s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du " "virkelig vil det, så bruk innstillingen APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen «%s» støttes ikke" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2412,184 +2478,208 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " +"ble brukt isteden. " + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappa %spartial mangler." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li av %li (%s gjenværende)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Finner ikke metode-driveren %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Klarer ikke finne informasjonom %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Lageret har et uoverensstemmende versjonssystem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Feil oppsto under behandling av %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Feil oppsto under behandling av %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått antallet versjoner denne APT klarer." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hashsummen stemmer ikke" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2598,7 +2688,7 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2607,13 +2697,13 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Feil størrelse" @@ -2622,7 +2712,7 @@ msgstr "Feil st msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2631,47 +2721,60 @@ msgstr "" "Bruker CD-ROM monteringspunkt %s\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Indentifiserer.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " +"signaturer\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" +msgid "Found label '%s'\n" +msgstr "Fant merkelapp «%s»\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prøv igjen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2680,94 +2783,114 @@ msgstr "" "CD-en er kalt: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Avmonterer CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Skrev %i poster med %i manglende filer og %i feile filer.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installerer %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Setter opp %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Fjerner %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Kjører etter-installasjonsutløser %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Mappa «%s» mangler" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Forbereder konfigurering %s" +msgstr "Forbereder oppsett av %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Konfigurer %s" +msgid "Processing triggers for %s" +msgstr "Behandler utløsere for %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Fjerner %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder å fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" msgstr "Kunne ikke åpne fila %s" @@ -2775,13 +2898,54 @@ msgstr "Kunne ikke msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Dynamisk MMap gikk tom for minne" + +#~ 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 "" +#~ "Ettersom du bare bestilte et enkelt inngrep er det overveiende " +#~ "sannsynlig\n" +#~ "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " +#~ "feilmelding." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linje %d er for lang (maks %lu)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linje %d er for lang (maks %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Lagret merkelapp: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Utvalget mislykkes" + #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endret %s" #~ msgid "Reading file list" #~ msgstr "Leser filliste" -#, fuzzy #~ msgid "Could not execute " #~ msgstr "Får ikke låst %s" diff --git a/po/ne.po b/po/ne.po index 2830067..3c4c1f3 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -16,145 +16,156 @@ msgstr "" "Plural-Forms: nplurals=2;plural=(n!=1)\n" "X-Generator: KBabel 1.10.2\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 तोक्न असक्षम भयो" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "कूल प्याकेज नामहरू :" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " सामान्य प्याकेजहरू:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "शुद्ध अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " एकल अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " मिश्रित अवास्तविक प्याकेजहरू:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " हराइरहेको:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "कूल भिन्न संस्करणहरू:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "कूल भिन्न संस्करणहरू:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "कूल निर्भरताहरू:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "जम्मा ver/file सम्बन्धहरू: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "जम्मा ver/file सम्बन्धहरू: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "कूल उपलब्ध मानचित्रणहरू:" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "कूल शिथिल खाली ठाऊँ:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "को लागि कूल खाली ठाऊँ लेखांकन:" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "कुनै प्याकेजहरू फेला परेन" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "प्याकेज फाइलहरू:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "क्यास sync भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "पिन गरिएका प्याकेजहरू:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(फेला परेन)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " स्थापना भयो:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(कुनै पनि होइन)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " उमेद्वार:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "प्याकेज पिन:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -215,7 +226,7 @@ msgstr "" " आधारित - प्याकेजको लागि कच्चा निर्भरता सूचना देखाउनुहोस्\n" " rdepends - प्याकेजको लागि उल्टो निर्भरता सूचना देखाउनुहोस्\n" " pkgnames - सबै प्याकेजहरुको नामहरू सूचिबद्ध गर्नुहोस्\n" -" dotty - GraphVis को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n" +" dotty - GraphViz को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n" " xvcg - xvcg को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n" " नीति - नीति सेटिङ्गहरू देखाउनुहोस्\n" "\n" @@ -302,7 +313,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -311,31 +322,31 @@ msgstr " %s मा लेख्न असक्षम" msgid "Cannot get debconf version. Is debconf installed?" msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "प्याकेज विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "स्रोत विस्तार सूचि अति लामो छ" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -418,292 +429,303 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "कुनै चयनहरू मेल खाएन" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" -#: ftparchive/cachedb.cc:73 +#: 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 "" + +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB फाइल %s असक्षम भयो: %s" -#: ftparchive/cachedb.cc:114 +#: 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 "File date has changed %s" -msgstr "फाइल डेटाले %s परिवर्तन गर्यो" +msgid "Failed to stat %s" +msgstr " %s स्थिर गर्न असफल" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s स्थिर गर्न असक्षम\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "%s हल गर्न असफल भयो" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "ट्री हिडाईँ असफल भयो" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "लिङ्क पढ्न असफल %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "अनलिङ्क गर्न असफल %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s मा %s लिङ्क असफल भयो" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr " %s स्थिर गर्न असफल" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/contents.cc:317 +#: ftparchive/writer.cc:620 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" + +#: ftparchive/writer.cc:624 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" + +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "अधिलेखन फाइल पढ्न असफल %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "FILE* सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "काँटा गर्न असफल" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "सङ्कुचन शाखा" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "सङ्कुचनविहिन कर्ता" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr "वा" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -711,143 +733,143 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "निर्भरताहरू सुधार गरिदैछ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr "असफल भयो ।" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "यी सुधार गर्न तपाईँले `apt-get -f install' चलाउन पर्छ ।" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! " -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: 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:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 -#: apt-pkg/cachefile.cc:67 +#: 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 "स्रोतहरुको सूचि पढ्न सकिएन ।" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक ।\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "संग्रहहरुको %sB प्राप्त गर्न आवश्यक ।\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "हो,मैले भने जस्तै गर्नुहोस्!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -858,28 +880,28 @@ msgstr "" "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "परित्याग गर्नुहोस् ।" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -887,47 +909,47 @@ msgstr "" "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास " "गर्नुहुन्छ ?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "स्थापना परित्याग गरिदैछ ।" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [स्थापना भयो]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -938,75 +960,117 @@ msgstr "" "यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n" " अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " -"एउटा प्रयोग गरियो ।" -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "प्याकेज फेला पार्न सकिएन %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "तर %s स्थापना हुनुपर्यो" + +#: 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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1078,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1027,136 +1091,122 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1569 -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" -" बग प्रतिवेदन भरिनेछ ।" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: 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:1950 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:1979 +#: 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:1982 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2060 +#: 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:2077 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,30 +1215,31 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2299 +#: 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:2324 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1203,6 +1254,8 @@ msgid "" " 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" @@ -1218,7 +1271,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1337,24 +1390,28 @@ msgstr "" msgid "Bad default setting!" msgstr "खराब पूर्वनिर्धारण सेटिङ्ग!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "निरन्तरता दिन इन्टर थिच्नुहोस् ।" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "अनप्याक गर्दा केही त्रुटिहरू देखा पर्यो । म कनफिगर गर्न गइरहेको छु" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "स्थापना भएको प्याकेजहरू । यसले नक्कली त्रुटिहरुमा नतिजा गर्न सक्छ" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "वा त्रुटि हरटाइरहेको निर्भरताहरुले गरेको हो । यो ठीक छ, मात्र त्रुटिहरू" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1365,188 +1422,188 @@ msgstr "" msgid "Merging available information" msgstr "उपलब्ध सूचना गाँभिदैछ" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "पाइपहरू सिर्जना गर्न असफल" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "gzip कार्यन्वयन गर्न असफल" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "अवैध संग्रह हस्ताक्षर" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि " -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "अवैध संग्रह सदस्य हेडर" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "संग्रह अति छोटो छ" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "संग्रह हेडरहरू पढ्न असफल" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "ह्यास तत्व तोक्न असफल भयो" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "मोड बाँड्न असफल भयो" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "थपमोडमा आन्तरिक त्रुटि" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "मोडको डबल थप %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "बाटो %s अति लामो छ " -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "डाइरेक्ट्री %s फेरियो " -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "घुम्ती बाटो अति लामो छ" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "बाटो अति लामो छ" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 पढ्न असफल भयो" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s स्थिर गर्न असक्षम भयो" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s लाई फेरी सार्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s सिर्जना गर्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo स्थिर गर्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "प्याकेज सूचिहरू पढिदैछ" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "प्रशासनिक डाइरेक्ट्री %sinfo मा परिवर्तन गर्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "प्याकेज नाम प्राप्त गर्दा आन्तरिक त्रुटि" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "फाइल सूचि पढिदैछ" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1556,77 +1613,77 @@ msgstr "" "सूचि फाइल '%sinfo/%s' खोल्न असफल भयो । यदि तपाईँ यो फाइल पुन:भण्डारण गर्नु सक्नुहुन्न " "भने यसलाई खाली गर्नुहोस् र तुरुन्तै प्याकेजको उही संस्करण पुन-स्थापना गर्नुहोस् !" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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 पढ्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "नोड प्राप्त गर्दा आन्तरिक त्रुटि" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "घुमाउरो फाइल %sdiversions खोल्न असफल भयो" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "घुमाउरो फाइल दूषित भयो" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "आन्तरिक त्रुटिले मोड थपिरहेछ" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "pkg क्यास पहिले सुरुवात हुनुपर्छ" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "प्याकेज फेला पार्न असफल भयो: हेडर, अफसेट %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "वस्तु स्थिति फाइलमा खराब कनफिग फाइल । अफसेट %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 पद वर्णन गर्दा त्रुटि । अफसेट %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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' सदस्य हराइरहेछ" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "यो वैध DEB संग्रह होइन, यो संग '%s' वा '%s' सदस्य छैन" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "%s मा परिवर्तन गर्न सकिदैन" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "आन्तरिक त्रुटि, सदस्य तोक्न सकिदैन" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "वैध नियन्त्रण फाइल स्थित गर्नु असफल भयो" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल" @@ -1647,25 +1704,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "गलत सिडी रोम" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s मा सिडी रोम अनमाउन्ट गर्न असक्षम भयो, यो अहिले प्रयोगमा हुन सक्छ ।" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: 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 "स्थिर गर्न असफल भयो" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -1727,7 +1784,7 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1739,7 +1796,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1793,7 +1850,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1820,531 +1877,558 @@ msgstr "क्वेरी" msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' हल गर्न सकिएन" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' हल गर्दा अस्थायी असफल" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् " -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "हेडरहरुको लागि पर्खिदैछ" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "खराब हेडर लाइन" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "फाइल %s लेख्न असफल भयो" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" msgstr "आन्तरिक त्रुटि" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "एउटा खाली फाइल mmap बनाउन सकिएन" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "चयन %s फेला पार्न सकिएन" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "लाइन %d अति लामो छ (अधिक्तम %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: यहाँ बाट समावेश गरेको" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... त्रुटि!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... गरियो" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 बुझिएन" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "आदेश लाइन विकल्प %s बूलियन छैन" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा = हुनुपर्छ ।" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "विकल्प %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "विकल्प '%s' अति लामो छ" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 मा परिवर्तन गर्न असक्षम" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "खाली प्याकेज क्यास" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "प्याकेज क्यास फाइल दूषित भयो " -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "आधारित" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "पुन:आधारित" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "सुझाव दिन्छ" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "सिफारिस गर्दछ" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "द्वन्दहरू" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "बदल्छ" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "वेकायमहरू" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "महत्वपूर्ण" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "आवश्यक" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "मानक" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "वैकल्पिक" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "अतिरिक्त" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "निर्भरता ट्री निर्माण गरिदैछ" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "उमेद्वार संस्करणहरू" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "निर्भरता सिर्जना" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "उपलब्ध सूचना गाँभिदैछ" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s खोल्न असफल" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "फाइल %s लेख्न असफल भयो" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2355,18 +2439,18 @@ msgstr "" "हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::" "Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" -#: apt-pkg/algorithms.cc:241 +#: 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 पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2374,179 +2458,207 @@ msgstr "" "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " "कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/acquire.cc:62 +#: 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 "" +"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " +"एउटा प्रयोग गरियो ।" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:377 +#: 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'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s स्थिर गर्न असक्षम भयो ।" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "पिन टाइप %s बुझ्न सकिएन " -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ प्याकेज)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज १ प्रयोग गर्नुहोस्)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज २ प्रयोग गर्नुहोस्)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण १)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज ३ प्रयोग गर्नुहोस्)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण २)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (संकलन फाइलले उपलब्ध गर्दछ)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5Sum मेल भएन" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:753 +#: 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 " @@ -2555,7 +2667,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:812 +#: 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 " @@ -2564,13 +2676,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -2579,7 +2691,7 @@ msgstr "साइज मेल खाएन" msgid "Vendor block %s contains no fingerprint" msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2588,47 +2700,59 @@ msgstr "" "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" "सिडी रोम माउन्ट गरिदैछ\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "परिचय गराइदैछ.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "डिस्को लागि पर्खिदै...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "सिडी रोम माउन्ट गरिदै...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i हस्ताक्षरहरू फेला परे\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2637,92 +2761,160 @@ msgstr "" "यो डिस्कको नाम:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i रेकर्डहरू लेखियो ।\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " %s स्थापना भयो" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr " %s कनफिगर गरिदैछ" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr " %s हटाइदैछ" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr " %s कनफिगर गरिदैछ" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr " %s हटाइदैछ" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "फाइल %s खोल्न सकिएन" + #: 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" +#~ " बग प्रतिवेदन भरिनेछ ।" + +#, 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 प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)" + +#, 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" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "असफल चयन गर्नुहोस्" + +#~ msgid "File date has changed %s" +#~ msgstr "फाइल डेटाले %s परिवर्तन गर्यो" diff --git a/po/nl.po b/po/nl.po index 6434942..8175423 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,153 +7,163 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-17 22:35+0100\n" -"Last-Translator: Bart Cornelis \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-05-05 18:39+0200\n" +"Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \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" +"X-Poedit-Language: Dutch\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Totaal aantal pakketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normale pakketten: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Zuiver virtuele pakketten: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Losstaande virtuele pakketten: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Gemengde virtuele pakketten: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Ontbrekend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totaal aantal verschillende versies: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Totaal aantal verschillende beschrijvingen: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totaal aantal vereisten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totaal aantal versie/bestand-relaties: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Totaal aantal Beschrijving/bestand-relaties: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totaal aantal 'Voorziet'-toewijzingen " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totaal aantal geglobde strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Totale hoeveelheid vereisten-versieruimte: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totale onbenutte ruimte: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "U dient precies één patroon op te geven" +msgstr "U dient precies één patroon op te geven" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(niet gevonden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " -msgstr " Geïnstalleerd: " +msgstr " Geïnstalleerd: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(geen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s voor %s %s gecompileerd op %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s voor %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -213,7 +223,7 @@ msgstr "" " depends - Toon de vereisten voor een pakket\n" " rdepends - Toon de pakketten die afhankelijk zijn van een pakket\n" " pkgnames - Toon de namen van alle pakketten\n" -" dotty - Genereer pakketgrafen voor GraphVis\n" +" dotty - Genereer pakketgrafen voor GraphViz\n" " xvcg - Genereer pakketgrafen voor xvcg\n" " policy - Toon beleidsinstellingen\n" "\n" @@ -304,40 +314,40 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" +msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Fout bij het verwerken van map %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -388,7 +398,7 @@ msgstr "" " clean config\n" "\n" "Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n" -"Het ondersteunt verschillende generatiestijlen variërend van volledig \n" +"Het ondersteunt verschillende generatiestijlen variërend van volledig \n" "automatisch tot een functionele vervanging van dpkg-scanpackages en \n" "dpkg-scansources\n" "\n" @@ -422,26 +432,26 @@ msgstr "" " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Geen van de selecties kwam overeen" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -449,425 +459,425 @@ msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van " "apt, dient u de database te verwijderen en opnieuw aan te maken." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Uitvoeren van readlink op %s is mislukt" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Interne fout, kon onderdeel %s niet vinden" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Misvormde voorrangsingang %s op regel %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Voorrangsbestand %s kon niet gelezen worden" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Onbekend compressie-algoritme '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Gecomprimeerde uitvoer %s vereist een compressieset" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Aanmaken FILE* is mislukt" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Vorken van proces is mislukt" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Comprimeer kind" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "maar %s is geïnstalleerd" +msgstr "maar %s is geïnstalleerd" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "maar %s zal geïnstalleerd worden" +msgstr "maar %s zal geïnstalleerd worden" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "maar het is niet geïnstalleerd" +msgstr "maar het is niet geïnstalleerd" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "maar het zal niet geïnstalleerd worden" +msgstr "maar het zal niet geïnstalleerd worden" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " of" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" +msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" +"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " +msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "%lu opnieuw geïnstalleerd, " +msgstr "%lu opnieuw geïnstalleerd, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" +msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Vereisten worden gecorrigeerd..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet corrigeren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" +"WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Authenticatiewaarschuwing is genegeerd.\n" +msgstr "Authentificatiewaarschuwing is genegeerd.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "Sommige pakketten konden niet geauthenticeerd worden" +msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "De lijst van bronnen kon niet gelezen worden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." "org te mailen" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +888,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,49 +917,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " +"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" +msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" -msgstr " [Geïnstalleerd]" +msgstr " [Geïnstalleerd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "U dient er één expliciet te selecteren voor installatie." +msgstr "U dient er één expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,78 +970,122 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " -"zijn oudere versies van gebruikt." +"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " +"nodig:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "U kunt deze verwijderen via '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 "" +"Hmm, het lijkt erop dat de AutoRemover iets vernietigd heeft, dit zou\n" +"niet mogen kunnen. Gelieve een bug-rapport voor apt in te sturen." + +#. +#. 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 "De volgende informatie helpt u mogelijk verder:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Kon taak %s niet vinden" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s is ingesteld voor handmatige installatie.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1039,144 +1093,130 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Sommige pakketten konden niet geïnstalleerd worden. Dit kan betekenen dat u\n" +"Sommige pakketten konden niet geïnstalleerd worden. Dit kan betekenen dat u\n" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1569 -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 "" -"Aangezien u slechts een enkele opdracht gegeven hebt is het zeer \n" -"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" -"best een foutrapport indienen voor dit pakket." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "De volgende informatie helpt u mogelijk verder:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" +msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" +msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -"U dient tenminste één pakket op te geven om de bouwvereisten van te " +"U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1185,7 +1225,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1194,32 +1234,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " +"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1234,6 +1274,8 @@ msgid "" " 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" @@ -1249,7 +1291,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1264,16 +1306,18 @@ msgstr "" " apt-get [opties] install|remove pakket1 [pakket2 ...]\n" " apt-get [opties] source pakket1 [pakket2 ...]\n" "\n" -"apt-get is een eenvoudige commandolijn-interface voor het ophalen en \n" +"apt-get is een eenvoudige commandoregel-interface voor het ophalen en \n" "installeren van pakketten. De meest gebruikte opdrachten zijn 'update' en\n" "'install'.\n" "\n" "Opdrachten:\n" " update - Haal de laatste versie van de pakketlijst op\n" -" upgrade - Opwaardeer alle geïnstalleerde pakketten\n" +" upgrade - Opwaardeer alle geïnstalleerde pakketten\n" " install - Installeer nieuwe pakketten (pakket is b.v. libc6, niet libc6." "deb)\n" " remove - Verwijder pakketten\n" +" autoremove - Verwijder alle niet-gebruikte pakketten\n" +" purge - Verwijder en wis pakketten\n" " source - Haal bronarchieven op\n" " build-dep - Installeer de pakketten vereist voor het bouwen van de " "bronpakketten op\n" @@ -1372,30 +1416,34 @@ msgstr "" msgid "Bad default setting!" msgstr "Foute standaardinstelling!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Druk 'enter' om door te gaan." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Wilt u alle eerder opgehaalde '.deb'-bestanden verwijderen?" + # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Er zijn fouten opgetreden tijdens het uitpakken. De geïnstalleerde" +msgstr "Er zijn fouten opgetreden tijdens het uitpakken. De geïnstalleerde" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "pakketten worden geconfigureerd. Hierbij kunnen fouten meerdere malen " "optreden" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "of veroorzaakt worden door niet-voldane vereisten. Dit is Ok, enkel de fouten" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1406,189 +1454,189 @@ msgstr "" msgid "Merging available information" msgstr "De beschikbare informatie wordt samengevoegd" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ongeldige archiefondertekening" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Fout bij het lezen van de koptekst van het archief-onderdeel" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ongeldige koptekst in archiefonderdeel" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archief is te kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Lezen van de archiefkopteksten is mislukt" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode werd aangeroepen op een nog gelinkte knoop" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Localiseren van het hash-element is mislukt!" +msgstr "Lokaliseren van het hash-element is mislukt!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Toewijzen van de omleiding is mislukt" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Interne fout in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Er wordt gepoogd om de omleiding %s->%s en %s/%s te overschrijven" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dubbele toevoeging van de omleiding %s->%s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Het pad %s is te lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s wordt meer dan eens uitgepakt" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "De map %s is al omgeleid" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Het omleidingspad is te lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "De map %s wordt vervangen door een niet-map" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Vinden van de knoop in de hash-emmer is mislukt" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Het pad is te lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Kan %s niet lezen" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kan de status van %s niet opvragen" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Verwijderen van %s is mislukt" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kan %s niet aanmaken" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Opvragen van de status van %sinfo is mislukt" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Pakketlijsten worden ingelezen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Verspringen naar de beheermap %sinfo is mislukt" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Interne fout bij het ophalen van de pakketnaam" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Bestandslijst worden ingelezen" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1596,89 +1644,88 @@ msgid "" "package!" msgstr "" "Openen van het lijstbestand '%sinfo/%s' is mislukt. Als u dit bestand niet " -"kunt herstellen, dient u het leeg te maken en daarna onmiddelijk dezelfde " +"kunt herstellen, dient u het leeg te maken en daarna onmiddellijk dezelfde " "versie van het pakket te installeren!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Lezen van lijstbestand %sinfo/%s is mislukt" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Interne fout bij het verkrijgen van een knoop" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Openen van het omleidingsbestand %sdiversions is mislukt" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ongeldige regel in het omleidingsbestand: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Interne fout bij het toevoegen van een omleiding" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "De pakketcache dient eerst geïnitialiseerd te zijn" +msgstr "De pakketcache dient eerst geïnitialiseerd te zijn" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Vinden van een 'Package:'-koptekst is mislukt, regel %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fout bij het parsen van de MD5. regel %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Dit is geen geldig DEB archief, het onderdeel '%s' mankeert" +msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Dit is geen geldig DEB-archief, het bevat noch een '%s' nog een '%s' " -"onderdeel" +"Dit is geen geldig DEB-archief, het bevat geen '%s', '%s', of '%s' onderdeel" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Kon niet wijzigen naar %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Interne fout, kon onderdeel niet vinden" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Localiseren van een geldig 'control'-bestand is mislukt" +msgstr "Lokaliseren van een geldig 'control'-bestand is mislukt" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Niet-ontleedbaar 'control'-bestand" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Kan de cd-rom databank %s niet lezen" +msgstr "Kan de cd databank %s niet lezen" #: methods/cdrom.cc:123 msgid "" @@ -1692,27 +1739,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Verkeerde CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -"Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." +"Kan de CD in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Status opvragen is mislukt" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1774,7 +1820,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1786,7 +1832,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -1840,7 +1886,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1867,59 +1913,59 @@ msgstr "Zoekopdracht" msgid "Unable to invoke " msgstr "Aanroepen mislukt van " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" @@ -1929,44 +1975,44 @@ msgstr "Kan niet verbinden met %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Kon de sleutelring niet benaderen: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt " "afgesloten." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Er is tenminste één ongeldige ondertekening gevonden." +msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gnupg " -"geïnstalleerd?)" +"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv " +"geïnstalleerd?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"De volgende ondertekeningen konden niet geverifiëerd worden omdat de " +"De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" #: methods/gzip.cc:64 @@ -1979,462 +2025,488 @@ msgstr "Kon geen pijp openen voor %s" msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Wegschrijven van bestand %s is mislukt" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Interne fout" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Onbekende typeafkorting '%c'" +msgstr "Onbekende type-afkorting '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Regel %d is te lang (maxl %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fout!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Klaar" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Commandoregel-optie '%c' [van %s] is onbekend." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Commandoregel-optie %s wordt niet begrepen" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Commandoregel-optie %s is niet booleaans" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Optie %s vereist een argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Optie %s: De specificatie van het configuratie-item dient een = te " "bevatten." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Optie %s vereist een integer getal als argument, niet '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Optie '%s' is te lang" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ongeldige operatie %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Kan %s niet veranderen" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Lege pakketcache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Het pakketcachebestand heeft een niet-compatible versie" +msgstr "Het pakketcachebestand heeft een niet-compatibele versie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Voor-Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggesties" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Aanbevelingen" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicteert met" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Vervangt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Verouderd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Breekt" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "belangrijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "noodzakelijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standaard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optioneel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "De status informatie wordt gelezen" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Openen van StateFile %s is mislukt" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"Deze installatieaanroep vereist het tijdelijk verwijderen van het essentiële " -"pakket %s, dit omwille van een Conflicts/Pre-Depends -lus. Dit is vaak " -"slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie te " -"activeren." +"Deze installatie-aanroep vereist het tijdelijk verwijderen van het " +"essentiële pakket %s, dit omwille van een Conflicts/Pre-Depends -lus. Dit is " +"vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie " +"te activeren." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexbestandtype '%s' wordt niet ondersteund" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " +"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2442,190 +2514,216 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " +"zijn oudere versies van gebruikt." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Het methodestuurprogramma %s kon niet gevonden worden." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " "'enter' te drukken." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kan de status van %s niet opvragen." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Uw bronnenlijst (/etc/apt/sources.list) dient minstens 1 bron-URI te bevatten" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "De pakketlijsten of het statusbestand konden of niet ontleed, of niet " "geopend worden." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Fout tijdens verwerken van %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Fout tijdens verwerken van %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Wauw, u heeft meer pakketten dan deze APT aankan." +msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Wauw, u heeft meer versies dan deze APT aankan." +msgstr "Wauw, u heeft meer versies dan deze APT aan kan." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan " +"overschreden." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." +msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" +msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "hernoeming is mislukt, %s (%s -> %s)." +msgstr "herbenoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5Sum komt niet overeen" +msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash-som komt niet overeen" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2634,7 +2732,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2643,7 +2741,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2651,7 +2749,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2660,7 +2758,7 @@ msgstr "Grootte komt niet overeen" msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2669,47 +2767,60 @@ msgstr "" "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" "CD wordt aangekoppeld\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificatie..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD wordt afgekoppeld...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescant voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu " +"handtekeningen gevonden\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Label '%s' gevonden\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2718,99 +2829,130 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD wordt afgekoppeld..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s is geïnstalleerd" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "%s wordt geconfigureerd" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "%s wordt verwijderd" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Map '%s' is afwezig." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "%s wordt geconfigureerd" +msgid "Processing triggers for %s" +msgstr "Fout bij het verwerken van triggers voor %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "%s is geïnstalleerd" +msgstr "%s is geïnstalleerd" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "%s wordt verwijderd" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet " +"aangekoppeld?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Kon het bestand %s niet openen" +msgstr "Kon bestand niet patchen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" + +#~ 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 "" +#~ "Aangezien u slechts een enkele opdracht gegeven hebt is het zeer \n" +#~ "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" +#~ "best een foutrapport indienen voor dit pakket." diff --git a/po/nn.po b/po/nn.po index 43715ac..fc0dabd 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -18,145 +18,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Tal på pakkenamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Vanlege pakkar: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Reine virtuelle pakkar: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakkar: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Samansette virtuelle pakkar: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manglar: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Tal på einskildversjonar: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Tal på einskildversjonar: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Tal på krav: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Tal på ver./fil-forhold: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Tal på ver./fil-forhold: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Tal på tilbyr-forhold: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Tal på strengar med jokerteikn: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Storleik på kravs- og versjonsrom: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slingringsmon: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Brukt plass i alt: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du må oppgi nøyaktig eitt mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikkje funne)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -179,8 +190,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -216,7 +227,7 @@ msgstr "" " depends - Vis rå informasjon om krava til ein pakke.\n" " rdepends - Vis baklengs kravinformasjon for ein pakke\n" " pkgnames - Vis ei liste over alle pakkenamn.\n" -" dotty - Lag pakkegrafar for GraphVis.\n" +" dotty - Lag pakkegrafar for GraphViz.\n" " xvcg - Lag pakkegrafar for xvcg\n" " policy - Vis regelinnstillingar.\n" "\n" @@ -307,7 +318,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -316,31 +327,31 @@ msgstr "Klarte ikkje skriva til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -420,303 +431,303 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkårleg innstilling." -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ingen utval passa" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forsøkjer å oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Klarte ikkje få status til %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Klarte ikkje få peikar" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Å: Klarte ikkje lesa katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "Å: Klarte ikkje få status til %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "Å: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje slå opp %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Treklatring mislukkast" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa på %sB er nådd.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppføring\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppføring\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppføring\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Intern feil, fann ikkje medlemmen %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Misforma overstyring %s linje %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikkje lesa overstyringsfila %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjend komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-røyr til underprosessen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Klarte ikkje oppretta FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Klarte ikkje gafla" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Klarte ikkje køyra komprimeringa " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "dekomprimering" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet på %s til %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Følgjande pakkar har krav som ikkje er oppfylte:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "men lèt seg ikkje installera" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "men er ikkje installert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Dei følgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Dei følgjande pakkane vil verta FJERNA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Dei følgjande pakkane er haldne tilbake:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Dei følgjande pakkane vil verta oppgraderte:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:550 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -725,146 +736,145 @@ msgstr "" "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n" "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte på nytt, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Rettar på krav ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta på krav" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "" -"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." +msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar må fjernast, men fjerning er slått av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Kjeldelista kan ikkje lesast." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Må henta %sB/%sB med arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Må henta %sB med arkiv.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,78 +885,78 @@ msgstr "" "For å halda fram, må du skriva nøyaktig «%s».\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller " -"«--fix-missing»." +"Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller «--" +"fix-missing»." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert frå før og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Du må velja ein som skal installerast." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,76 +967,117 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n" "eller er berre tilgjengeleg frå ei anna kjelde\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Dei følgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert frå før.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgåva «%s» av «%s»" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen «%s» av «%s»" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Klarte ikkje låsa listekatalogen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Dei følgjande NYE pakkane vil verta installerte:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " -"filer er brukte i staden." -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "Følgjande informasjon kan hjelpa med å løysa situasjonen:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Intern feil. AllUpgrade øydelagde noko" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Fann ikkje pakken %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "men %s skal installerast" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "" -"Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." +msgstr "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1034,7 +1085,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1046,137 +1097,123 @@ msgstr "" "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i «Incoming»." -#: cmdline/apt-get.cc:1569 -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 "" -"Sidan du berre har valt ein enkel operasjon, er det svært sannsynleg at\n" -"pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" -"feilmelding." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Øydelagde pakkar" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Tilrådde pakkar" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1185,31 +1222,32 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Støtta modular:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1262,8 @@ msgid "" " 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" @@ -1239,7 +1279,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1359,24 +1399,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Dårleg standardinnstilling" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Trykk Enter for å halda fram." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Nokre feil oppstod ved utpakking. Dei installerte pakkane vert no" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "sette opp. Dette kan føra til følgjefeil eller feil på grunn av" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "krav som ikkje er oppfylte. Det gjer ikkje noko, berre feila ovanfor" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "er viktige. Rett opp dei feila og [i]nstaller på nytt." @@ -1385,189 +1429,189 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p msgid "Merging available information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta røyr" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Klarte ikkje køyra gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Øydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Klarte ikkje lesa arkivhovuda" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode vart kalla på ein node som framleis er lenkja" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fann ikkje nøkkelelementet." -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikkje tildela avleiing" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prøver å skriva over ei avleiing, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tilleggjing av avleiing %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stigen %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkar ut %s meir enn éin gong" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avleidd" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prøver å skriva til avleiingsmålet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Avleiingsstigen er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Fann ikkje noden i nøkkelbøtta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stigen er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv over pakketreff utan versjon for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Klarte ikkje lesa %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikkje få status til %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Klarte ikkje fjerna %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Klarte ikkje oppretta %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Klarte ikkje få status til %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Les pakkelister" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Klarte ikkje byta til adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Intern feil ved henting av pakkenamn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Les filliste" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1578,78 +1622,78 @@ msgstr "" "denne fila, bør du oppretta ho som ei tom fil og installera den same " "versjonen av pakken på nytt." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Klarte ikkje lesa listefila %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern feil ved henting av node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Klarte ikkje opna avleiingsfila %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Avleiingsfila er øydelagd" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Ugyldig linje i avleiingsfila: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Intern feil ved tilleggjing av avleiing" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakkelageret må først klargjerast" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Fann ikkje «Package:»-linja, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Øydelagd «ConfFile»-del i statusfila. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Feil ved tolking av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" "Dette er ikkje eit gyldig DEB-arkiv, det har ingen «%s» eller «%s»-medlem" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Klarte ikkje byta til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Intern feil, fann ikkje medlem" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Fann ikkje noka gyldig kontrollfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Kontrollfila kan ikkje tolkast" @@ -1670,28 +1714,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Feil CD-plate" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Klarte ikkje få status" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1753,7 +1796,7 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1765,7 +1808,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokolløydeleggjing" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1819,7 +1862,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1846,59 +1889,59 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikkje starta " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Koplar til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot på sambandet" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje slå opp «%s»" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av «%s»" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Klarte ikkje kopla til %s %s:" @@ -1908,34 +1951,34 @@ msgstr "Klarte ikkje kopla til %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Klarte ikkje slå opp «%s»" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1951,427 +1994,454 @@ msgstr "Klarte ikkje opna r msgid "Read error from %s process" msgstr "Lesefeil frå %s-prosessen" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Ventar på hovud" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Øydelagd hovudlinje" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har øydelagd støtte for område" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsavbrot på sambandet" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Feil ved lesing frå tenaren" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Klarte ikkje skriva fila %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Øydelagde hovuddata" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Intern feil" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Kan ikkje utføra mmap på ei tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: «%c»" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linja %d er for lang (maks %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nøsta inkluderte filer" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifrå" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikkje støtta" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikkje kommandolinjevalet «%c» (frå %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Skjønar ikkje kommandolinjevalet %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalet %s er ikkje boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valet %s krev eit argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Val %s: Spesifikasjonen av oppsettselementet må ha ein =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valet %s må ha eit heiltalsargument, ikkje «%s»" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valet «%s» er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjønar ikkje %s. Prøv «true» eller «false»." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje få status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Klarte ikkje byta til %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Klarte ikkje få status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje låsing for den skrivebeskytta låsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna låsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje låsing for den nfs-monterte låsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje låsa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta på %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att å lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem ved låsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkelagerfila er øydelagd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT støttar ikkje versjonssystemet «%s»" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Krav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forkrav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Forslag" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Tilrådingar" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Byter ut" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Foreldar" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "påkravd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanleg" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Flettar informasjon om tilgjengelege pakkar" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Klarte ikkje opna %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Klarte ikkje skriva fila %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2383,18 +2453,18 @@ msgstr "" "om du verkeleg vil gjera det, kan du bruka innstillinga «APT::Force-" "LoopBreak»." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen «%s» er ikkje støtta" -#: apt-pkg/algorithms.cc:241 +#: 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 "Pakken %s må installerast på nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2402,44 +2472,52 @@ msgstr "" "Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " +"filer er brukte i staden." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Les filliste" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Finn ikkje metodedrivaren %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2447,140 +2525,159 @@ msgstr "" " «%s»\n" "i stasjonen «%s» og trykk Enter.\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» er ikkje støtta" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Klarte ikkje få status på %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du må leggja nokre kjelde-URI-ar i fila sources.list." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prøva å retta på desse problema ved å køyra «apt-get update»." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Skjønar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jøss, du har overgått talet på krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje få status på kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Feil MD5-sum" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2589,7 +2686,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2597,14 +2694,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Feil storleik" @@ -2613,7 +2710,7 @@ msgstr "Feil storleik" msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2622,47 +2719,59 @@ msgstr "" "Brukar monteringspunktet %s for CD-ROM\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identifiserer ... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Ventar på disk ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler på disken ...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Lagra etikett: %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2671,92 +2780,113 @@ msgstr "" "Disken vert kalla: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppføringar for denne disken er:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Avmonterer CD-ROM ..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Installert: " + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Koplar til %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Opnar %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Listekatalogen %spartial manglar." + +#: apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, fuzzy, c-format -msgid "Configuring %s" -msgstr "Koplar til %s" +msgid "Processing triggers for %s" +msgstr "Feil ved lesing av katalogen %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Opnar %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrådingar" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" @@ -2766,6 +2896,45 @@ msgstr "Klarte ikkje opna fila %s" msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#~ 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 "" +#~ "Sidan du berre har valt ein enkel operasjon, er det svært sannsynleg at\n" +#~ "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" +#~ "feilmelding." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linja %d er for lang (maks %d)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linja %d er for lang (maks %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Feil ved behandling av %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Feil ved behandling av %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Lagra etikett: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Utvalet mislukkast" + #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endra %s" diff --git a/po/pl.po b/po/pl.po index ce66c57..f421a88 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,159 +2,171 @@ # Polish translation by: # Marcin Owsiany , 2002, 2003, 2004. # Bartosz Fenski , 2005, 2006 +# Wiktor Wandachowicz , 2008 +# +# Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: +# http://wiki.debian.org/PolishL10N/PackageInstallers msgid "" msgstr "" -"Project-Id-Version: apt 0.5.5\n" +"Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-01-23 15:32+0100\n" -"Last-Translator: Bartosz Fenski \n" -"Language-Team: Polish \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 17:10+0100\n" +"Last-Translator: Wiktor Wandachowicz \n" +"Language-Team: Polish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Pakiet %s w wersji %s ma niespe³nione zale¿no¶ci:\n" +msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Nie uda³o siê odnale¼æ pakietu %s" +msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Liczba nazw pakietów : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Liczba nazw pakietów: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " Zwyk³ych pakietów: " +msgstr " Zwykłych pakietów: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " Czysto wirtualnych pakietów: " +msgstr " Czysto wirtualnych pakietów: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " Pojedynczych pakietów wirtualnych: " +msgstr " Pojedynczych pakietów wirtualnych: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Mieszanych pakietów wirtualnych: " +msgstr " Mieszanych pakietów wirtualnych: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " -msgstr " Brakuj±cych: " +msgstr " Brakujących: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "W sumie ró¿nych wersji: " +msgstr "W sumie różnych wersji: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "W sumie różnych opisów: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "W sumie zale¿no¶ci: " +msgstr "W sumie zależności: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "W sumie zale¿no¶ci wersja/plik: " +msgstr "W sumie zależności wersja/plik: " + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "W sumie zależności opis/plik: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "W sumie mapowañ zapewnieñ: " +msgstr "W sumie mapowań zapewnień: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "W sumie dopasowanych napisów: " +msgstr "W sumie dopasowanych napisów: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Sumaryczny rozmiar obszaru zale¿no¶ci od wersji: " +msgstr "Sumaryczny rozmiar obszaru zależności od wersji: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Ca³kowity rozmiar: " +msgstr "Całkowity rozmiar: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "Plik pakietu %s jest przestarza³y." +msgstr "Plik pakietu %s jest przestarzały." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Nale¿y podaæ dok³adnie jeden wzór" +msgstr "Należy podać dokładnie jeden wzorzec" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" -msgstr "Nie znaleziono ¿adnych pakietów" +msgstr "Nie znaleziono żadnych pakietów" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "Plików pakietów:" +msgstr "Plików pakietów:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"Magazyn podrêczny jest przestarza³y, nie mo¿na odwo³aæ siê (x-ref) do pliku " +"Magazyn podręczny jest przestarzały, nie można odwołać się (x-ref) do pliku " "pakietu." -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Przypiête pakiety:" +msgstr "Przypięte pakiety:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nieznaleziony)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(brak)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " -msgstr " Kandyduj±ca: " +msgstr " Kandydująca: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Sposób przypiêcia: " +msgstr " Sposób przypięcia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s dla %s %s skompilowany %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s dla %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +189,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -192,59 +204,59 @@ 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 "" -"U¿ycie: apt-cache [opcje] polecenie\n" +"Użycie: apt-cache [opcje] polecenie\n" " apt-cache [opcje] add plik1 [plik2 ...]\n" " apt-cache [opcje] showpkg pakiet1 [pakiet2 ...]\n" " apt-cache [opcje] showsrc pakiet1 [pakiet2 ...]\n" "\n" -"apt-cache to niskopoziomowe narzêdzie s³u¿±ce do manipulowania\n" -"binarnymi plikami magazynów podrêcznych APT-a, oraz do pobierania\n" +"apt-cache to niskopoziomowe narzędzie służące do manipulowania\n" +"binarnymi plikami magazynów podręcznych APT-a, oraz do pobierania\n" "z nich informacji.\n" "\n" "Polecenia:\n" -" add - Dodaj plik pakietów do magazynu podrêcznego\n" -" gencaches - Zbuduj magazyn podrêczny pakietów i ¼róde³\n" -" showpkg - Poka¿ ogólne informacje na temat pojedynczego pakietu\n" -" showsrc - Poka¿ informacje na temat ¼róde³\n" -" stats - Poka¿ podstawowe statystyki\n" -" dump - Poka¿ ca³y plik w skrótowej formie\n" -" dumpavail - Wypisz plik dostêpnych pakietów na standardowe wyj¶cie\n" -" unmet - Poka¿ niespe³nione zale¿no¶ci\n" -" search - Przeszukaj listê pakietów wed³ug wyra¿enia regularnego\n" -" show - Poka¿ czytelny rekord dla danego pakietu\n" -" depends - Poka¿ surowe informacje o zale¿no¶ciach danego pakietu\n" -" rdepends - Poka¿ informacje o zale¿no¶ciach OD danego pakietu\n" -" pkgnames - Poka¿ listê nazw wszystkich pakietów\n" -" dotty - Wygeneruj grafy pakietów dla programu GraphVis\n" -" xvcg - Wygeneruj grafy pakietów dla programu xvcg\n" -" policy - Poka¿ ustawienia polityki\n" +" add - Dodaje plik pakietów do magazynu podręcznego\n" +" gencaches - Buduje magazyn podręczny pakietów i źródeł\n" +" showpkg - Pokazuje ogólne informacje na temat pojedynczego pakietu\n" +" showsrc - Pokazuje informacje dla źródeł\n" +" stats - Pokazuje podstawowe statystyki\n" +" dump - Pokazuje cały plik w skrótowej formie\n" +" dumpavail - Wypisuje plik dostępnych pakietów na standardowe wyjście\n" +" unmet - Pokazuje niespełnione zależności\n" +" search - Przeszukuje listę pakietów według wyrażenia regularnego\n" +" show - Pokazuje informacje dla danego pakietu\n" +" depends - Pokazuje surowe informacje o zależnościach danego pakietu\n" +" rdepends - Pokazuje informacje o zależnościach OD danego pakietu\n" +" pkgnames - Pokazuje listę nazw wszystkich pakietów w systemie\n" +" dotty - Generuje grafy pakietów dla programu GraphViz\n" +" xvcg - Generuje grafy pakietów dla programu xvcg\n" +" policy - Pokazuje ustawienia polityki\n" "\n" "Opcje:\n" " -h Ten tekst pomocy.\n" -" -p=? Podrêczny magazyn pakietów.\n" -" -s=? Podrêczny magazyn ¼róde³.\n" -" -q Wy³±cz wska¼nik postêpu.\n" -" -i Poka¿ tylko wa¿ne zale¿no¶ci przy poleceniu unmet.\n" -" -c=? Czytaj ten plik konfiguracyjny.\n" -" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" -"Wiêcej informacji mo¿na znale¼æ na stronach podrêcznika apt-cache(8)\n" +" -p=? Podręczny magazyn pakietów.\n" +" -s=? Podręczny magazyn źródeł.\n" +" -q Wyłącza wskaźnik postępu.\n" +" -i Pokazuje tylko ważne zależności przy poleceniu unmet.\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +"Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n" "oraz 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 "Proszê wprowadziæ nazwê dla tej p³yty, np 'Debian 2.1r1 Disk 1'" +msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 2.1r1 Disk 1\"" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Proszê w³o¿yæ dysk do napêdu i nacisn±æ enter" +msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Powtórz ten proces dla reszty p³yt." +msgstr "Należy powtórzyć ten proces dla reszty płyt." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumenty nie s± w parach" +msgstr "Argumenty nie są w parach" #: cmdline/apt-config.cc:76 msgid "" @@ -261,23 +273,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"U¿ycie: apt-config [opcje] polecenie\n" +"Użycie: apt-config [opcje] polecenie\n" "\n" -"apt-config to proste narzêdzie do czytania pliku konfiguracyjnego APT\n" +"apt-config to proste narzędzie do czytania pliku konfiguracyjnego APT\n" "\n" "Polecenia:\n" -" shell - Tryb pow³oki\n" -" dump - Poka¿ konfiguracjê\n" +" shell - Tryb powłoki\n" +" dump - Pokazuje konfigurację\n" "\n" "Opcje:\n" " -h Ten tekst pomocy.\n" -" -c=? Czytaj ten plik konfiguracyjny.\n" -" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s nie jest prawid³owym pakietem DEB." +msgstr "%s nie jest prawidłowym pakietem DEB." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -292,51 +304,51 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"U¿ycie: apt-extracttemplates plik1 [plik2 ...]\n" +"Użycie: apt-extracttemplates plik1 [plik2 ...]\n" "\n" -"apt-extracttemplates to narzêdzie s³u¿±ce do pobierania informacji\n" -"i konfiguracji i szablonach z pakietów Debiana.\n" +"apt-extracttemplates to narzędzie służące do pobierania informacji\n" +"i konfiguracji i szablonach z pakietów Debiana.\n" "\n" "Opcje:\n" " -h Ten tekst pomocy.\n" -" -t Ustaw katalog tymczasowy\n" -" -c=? Czytaj ten plik konfiguracyjny.\n" -" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" +" -t Ustawia katalog tymczasowy\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" -msgstr "Nie uda³o siê pisaæ do %s" +msgstr "Nie udało się pisać do %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nie uda³o siê pobraæ wersji debconf. Czy debconf jest zainstalowany?" +msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "Lista rozszerzeñ pakietów jest zbyt d³uga" +msgstr "Lista rozszerzeń pakietów jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "B³±d przetwarzania katalogu %s" +msgstr "Błąd przetwarzania katalogu %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "Lista rozszerzeñ pakietów ¼ród³owych jest zbyt d³uga" +msgstr "Lista rozszerzeń źródeł jest zbyt długa" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "B³±d przy zapisywaniu nag³ówka do pliku zawarto¶ci" +msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "B³±d podczas przetwarzania zawarto¶ci %s" +msgstr "Błąd podczas przetwarzania zawartości %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -377,839 +389,874 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"U¿ycie: apt-ftparchive [opcje] polecenie\n" -"Polecenia: packages ¶cie¿ka_do_binariów [plik_override [przedrostek]]\n" -" sources ¶cie¿ka_do_¼róde³ [plik_override [przedrostek]]\n" -" contents ¶cie¿ka\n" -" release ¶cie¿ka\n" +"Użycie: apt-ftparchive [opcje] polecenie\n" +"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n" +" sources ścieżka_do_źródeł [plik_override [przedrostek]]\n" +" contents ścieżka\n" +" release ścieżka\n" " generate konfiguracja [grupy]\n" " clean konfiguracja\n" "\n" -"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obs³uguje\n" -"ró¿ne rodzaje generowania, od w pe³ni zautomatyzowanych po funkcjonalne\n" -"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n" +"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n" +"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n" +"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n" "\n" -"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n" -"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n" -"skróty MD5 i rozmiary. Obs³ugiwany jest plik override, pozwalaj±cy okre¶liæ\n" -"priorytet i dzia³ pakietu.\n" +"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n" +"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n" +"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n" +"priorytet i dział pakietu.\n" "\n" -"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n" -".dsc. Przy pomocy opcji --source-override mo¿na podaæ plik override dla\n" -"pakietów ¼ród³owych.\n" +"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n" +".dsc. Przy pomocy opcji --source-override można podać plik override dla\n" +"źródeł.\n" "\n" -"Polecenia 'packages' i 'sources' powinny byæ wykonywane w katalogu g³ównym\n" -"drzewa. `¶cie¿ka_do_binariów' powinna wskazywaæ na katalog, od którego " +"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu " +"głównym\n" +"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego " "zacznie\n" -"siê wyszukiwanie, a plik override powinien zawieraæ odpowiednie flagi.\n" -"Przedrostek (o ile zosta³ podany) jest dodawany przed ¶cie¿k± do ka¿dego\n" -"pliku. Przyk³adowe u¿ycie, z archiwum Debiana:\n" +"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n" +"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n" +"pliku. Przykładowe użycie, z archiwum Debiana:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Opcje:\n" " -h Ten tekst pomocy\n" -" --md5 Generuj sumy kontrolne MD5\n" -" -s=? Plik override dla ¼róde³\n" -" -q `Ciche' dzia³anie\n" -" -d=? Opcjonalna podrêczna baza danych\n" -" --no-delink W³±cz tryb diagnostyczny od³±czania\n" -" --contents Generuj plik zawarto¶ci (Contents)\n" -" -c=? Czytaj ten plik konfiguracyjny\n" -" -o=? Ustaw dowoln± opcjê konfiguracji" - -#: ftparchive/apt-ftparchive.cc:762 +" --md5 Generuje sumy kontrolne MD5\n" +" -s=? Plik override dla źródeł\n" +" -q \"Ciche\" działanie\n" +" -d=? Opcjonalna podręczna baza danych\n" +" --no-delink Włącza tryb diagnostyczny odłączania\n" +" --contents Generuje plik zawartości (Contents)\n" +" -c=? Czyta wskazany plik konfiguracyjny\n" +" -o=? Ustawia dowolną opcję konfiguracji" + +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Nie dopasowano ¿adnej nazwy" +msgstr "Nie dopasowano żadnej nazwy" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Brakuje pewnych plików w grupie plików pakietów `%s'" +msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "Baza by³a uszkodzona, plik zosta³ przeniesiony do %s.old" +msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Baza jest przestarza³a, próbujê zaktualizowaæ %s" +msgstr "Baza jest przestarzała, próbuję zaktualizować %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" +"Niepoprawny format bazy. Jeśli została zaktualizowana starsza wersja apt, " +"proszę usunąć i utworzyć ponownie bazę danych." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Nie uda³o siê otworzyæ pliku DB %s: %s" +msgstr "Nie udało się otworzyć pliku bazy %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Nie uda³o siê wykonaæ operacji stat na %s" +msgstr "Nie udało się wykonać operacji stat na %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "Archiwum nie posiada rekordu control" +msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "Nie uda³o siê pobraæ kursora" +msgstr "Nie udało się pobrać kursora" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: Nie uda³o siê odczytaæ katalogu %s\n" +msgstr "W: Nie udało się odczytać katalogu %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Nie mo¿na wykonaæ operacji stat na %s\n" +msgstr "W: Nie można wykonać operacji stat na %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E: B³êdy odnosz± siê do pliku " +msgstr "E: Błędy odnoszą się do pliku " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Nie uda³o siê przet³umaczyæ nazwy %s" +msgstr "Nie udało się przetłumaczyć nazwy %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Przej¶cie po drzewie nie powiod³o siê" +msgstr "Przejście po drzewie nie powiodło się" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Nie uda³o siê otworzyæ %s" +msgstr "Nie udało się otworzyć %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " Od³±czenie %s [%s]\n" +msgstr " Odłączenie %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Nie uda³o siê odczytaæ dowi±zania %s" +msgstr "Nie udało się odczytać dowiązania %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Nie uda³o siê usun±æ %s" +msgstr "Nie udało się usunąć %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Nie uda³o siê dowi±zaæ %s do %s" +msgstr "*** Nie udało się dowiązać %s do %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Osi±gniêto ograniczenie od³±czania %sB.\n" +msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "Archiwum nie posiada³o pola pakietu" +msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:623 -#, fuzzy, c-format +#: ftparchive/writer.cc:620 +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nie posiada wpisu w pliku override\n" +msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format +#: ftparchive/writer.cc:624 +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nie posiada wpisu w pliku override\n" +msgstr " %s nie posiada również wpisu w pliku override binariów\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "B³±d wewnêtrzny, nie uda³o siê odnale¼æ sk³adnika %s" +msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Nie uda³o siê zaalokowaæ pamiêci" +msgstr "realloc - Nie udało się zaalokować pamięci" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Nie mo¿na otworzyæ %s" +msgstr "Nie można otworzyć %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "B³êdna linia %2$lu #1 pliku override %1$s" +msgstr "Błędna linia %2$lu #1 pliku override %1$s" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "B³êdna linia %2$lu #2 pliku override %1$s" +msgstr "Błędna linia %2$lu #2 pliku override %1$s" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "B³êdna linia %2$lu #3 pliku override %1$s" +msgstr "Błędna linia %2$lu #3 pliku override %1$s" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Nie uda³o siê czytaæ pliku override %s" +msgstr "Nie udało się czytać pliku override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Nieznany algorytm kompresji '%s'" +msgstr "Nieznany algorytm kompresji \"%s\"" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Nie uda³o siê utworzyæ potoku IPC do podprocesu" +msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Nie uda³o siê utworzyæ obiektu FILE*" +msgstr "Nie udało się utworzyć obiektu FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Nie uda³o siê utworzyæ procesu potomnego" +msgstr "Nie udało się utworzyć procesu potomnego" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Potomny proces kompresuj±cy" +msgstr "Potomny proces kompresujący" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "B³±d wewnêtrzny, nie uda³o siê utworzyæ %s" +msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Nie uda³o siê utworzyæ IPC z podprocesem" +msgstr "Nie udało się utworzyć IPC z podprocesem" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Nie uda³o siê uruchomiæ kompresora " +msgstr "Nie udało się uruchomić kompresora " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "Zawiod³a operacja IO na pliku/podprocesie" +msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Nie uda³o siê czytanie w czasie liczenia skrótu MD5" +msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Nie uda³o siê zmieniæ nazwy %s na %s" +msgstr "Nie udało się zmienić nazwy %s na %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" -msgstr "B³±d kompilacji wyra¿enia regularnego - %s" +msgstr "Błąd kompilacji wyrażenia regularnego - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:" +msgstr "Następujące pakiety mają niespełnione zależności:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "ale %s ma zostaæ zainstalowany" +msgstr "ale %s ma zostać zainstalowany" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "ale nie da siê go zainstalowaæ" +msgstr "ale nie da się go zainstalować" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " lub" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "Zostan± zainstalowane nastêpuj±ce NOWE pakiety:" +msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:" +msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:" +msgstr "Następujące pakiety zostały zatrzymane:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "Nastêpuj±ce pakiety zostan± zaktualizowane:" +msgstr "Następujące pakiety zostaną zaktualizowane:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "Zostan± zainstalowane STARE wersje nastêpuj±cych pakietów:" +msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Zostan± zmienione nastêpuj±ce zatrzymane pakiety:" +msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety.\n" -"Nie powinno siê tego robiæ, chyba ¿e dok³adnie wiesz, co robisz!" +"UWAGA: Zostaną usunięte następujące istotne pakiety.\n" +"Nie powinno się tego robić, chyba że dokładnie wiesz co robisz!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu przeinstalowywanych, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "%lu cofniêtych wersji, " +msgstr "%lu cofniętych wersji, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n" +msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Naprawianie zale¿no¶ci..." +msgstr "Naprawianie zależności..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." -msgstr " nie uda³o siê." +msgstr " nie udało się." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "Nie uda³o siê naprawiæ zale¿no¶ci" +msgstr "Nie udało się naprawić zależności" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji" +msgstr "Nie udało się zminimalizować zbioru aktualizacji" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ." +msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f." +msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!" +msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Ostrze¿enie uwierzytelniania zignorowano.\n" +msgstr "Ostrzeżenie uwierzytelniania zignorowano.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? " +msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane" +msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "By³y problemy, a u¿yto -y bez --force-yes" +msgstr "Były problemy, a użyto -y bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "B³±d wewnêtrzny, InstallPackages u¿yto z zepsutymi pakietami!" +msgstr "Błąd wewnętrzny, InstallPackages użyto z uszkodzonymi pakietami!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone." +msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "B³±d wewnêtrzny, sortowanie niezakoñczone" +msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" +msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Nie uda³o siê odczytaæ list ¼róde³." +msgstr "Nie udało się odczytać list źródeł." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Dziwne.. rozmiary siê nie zgadzaj±, zg³o¶ pod apt@packages.debian.org" +msgstr "" +"Dziwne. Rozmiary się nie zgadzają, proszę to zgłosić pod apt@packages.debian." +"org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Konieczne pobranie %sB/%sB archiwów.\n" +msgstr "Konieczne pobranie %sB/%sB archiwów.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Konieczne pobranie %sB archiwów.\n" +msgstr "Konieczne pobranie %sB archiwów.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "Nie uda³o siê ustaliæ ilo¶ci wolnego miejsca w %s" +msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca." +msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne." +msgstr "Nakazano wykonywać tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "Tak, rób jak mówiê!" +msgstr "Tak, rób jak mówię!" -#: cmdline/apt-get.cc:868 +#: 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 "" -"Zaraz zrobisz co¶ potencjalnie szkodliwego.\n" -"Aby kontynuowaæ wpisz zdanie '%s'\n" +"Zaraz zrobisz coś potencjalnie szkodliwego.\n" +"Aby kontynuować wpisz zdanie \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "Czy chcesz kontynuowaæ [T/n]? " +msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Nie uda³o siê pobraæ %s %s\n" +msgstr "Nie udało się pobrać %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Nie uda³o siê pobraæ niektórych plików" +msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Ukoñczono pobieranie w trybie samego pobierania" +msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update " -"lub u¿yæ opcji --fix-missing" +"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " +"update lub użyć opcji --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane" +msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów." +msgstr "Nie udało się poprawić brakujących pakietów." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n" +"Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n" +msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji." +msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji." -#: cmdline/apt-get.cc:1091 +#: 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 "" -"Pakiet %s nie ma dostêpnej wersji, ale odnosi siê do niego inny pakiet.\n" -"Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n" -"pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych ¼róde³.\n" +"Pakiet %s nie ma dostępnej wersji, ale odnosi się do niego inny pakiet.\n" +"Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n" +"pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:" +msgstr "Jednak następujące pakiety go zastępują:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -"Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n" +"Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s jest ju¿ w najnowszej wersji.\n" +msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione" +msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona" +msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Wybrano wersjê %s (%s) dla %s\n" +msgstr "Wybrano wersję %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" -msgstr "Polecenie update nie wymaga ¿adnych argumentów" +msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Nie uda³o siê zablokowaæ katalogu list" +msgstr "Nie udało się zablokować katalogu list" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub " -"zosta³a u¿yta ich starsza wersja." +"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " +"wymagane:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Aby je usunąć należy użyć \"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 "" +"Wygląda na to, że AutoRemover coś uszkodził, a to naprawdę nie\n" +"powinno się zdarzyć. Prosimy o zgłoszenie błędu w pakiecie 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 "Następujące informacje mogą pomóc rozwiązać sytuację:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" +msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nie udało się odnaleźć zadania %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" -msgstr "Nie uda³o siê odnale¼æ pakietu %s" +msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" +msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:" +msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " -"podaj rozwi±zanie)." +"Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez " +"pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Nie uda³o siê zainstalowaæ niektórych pakietów. Mo¿e to oznaczaæ,\n" -"¿e za¿±dano niemo¿liwej sytuacji lub u¿ywasz dystrybucji niestabilnej,\n" -"w której niektóre pakiety nie zosta³y jeszcze utworzone lub przeniesione\n" -"z katalogu Incoming (\"Przychodz±ce\")." +"Nie udało się zainstalować niektórych pakietów. Może to oznaczać,\n" +"że zażądano niemożliwej sytuacji lub używasz dystrybucji niestabilnej,\n" +"w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" +"z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1569 -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 "" -"Poniewa¿ za¿±dno tylko jednej operacji, jest bardzo prawdopodobne, ¿e\n" -"danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" -"b³±d." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" -msgstr "Pakiety s± b³êdne" +msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" +msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" -msgstr "Nie uda³o siê" +msgstr "Nie udało się" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o" +msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -"Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pobrane " -"¼ród³a" +"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " +"źródła" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "Nie uda³o siê odnale¼æ ¼ród³a dla pakietu %s" +msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Pomijanie ju¿ pobranego pliku '%s'\n" +msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" +msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n" +msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n" +msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Pobierz ¼ród³o %s\n" +msgstr "Pobierz źródło %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Nie uda³o siê pobraæ niektórych archiwów." +msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Pomijanie rozpakowania ju¿ rozpakowanego ¼ród³a w %s\n" +msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" +msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Sprawd¼ czy pakiet 'dpkg-dev' jest zainstalowany.\n" +msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Polecenie budowania '%s' zawiod³o.\n" +msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" -msgstr "Proces potomny zawiód³" +msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety " -"wymagane do budowania" +"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " +"zależności na czas budowania" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -"Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s" +"Nie udało się pobrać informacji o zależnościach na czas budowania dla %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" +msgstr "%s nie ma zależności czasu budowania.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " +"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2282 +#: 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 "" -"Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych " +"Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: Zainstalowany pakiet %s jest zbyt " +"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: %s" +msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s." +msgstr "Nie udało się spełnić zależności na czas budowania od %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" +msgstr "Nie udało się przetworzyć zależności na czas budowania" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" -msgstr "Obs³ugiwane modu³y:" +msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1271,8 @@ msgid "" " 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" @@ -1239,7 +1288,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1250,43 +1299,45 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"U¿ycie: apt-get [opcje] polecenie\n" +"Użycie: apt-get [opcje] polecenie\n" " apt-get [opcje] install|remove pakiet1 [pakiet2 ...]\n" " apt-get [opcje] source pakiet1 [pakiet2 ...]\n" "\n" -"apt-get to prosty interfejs linii poleceñ do pobierania i instalacji\n" -"pakietów. Najczê¶ciej u¿ywane polecenia to update i install.\n" +"apt-get to prosty interfejs wiersza poleceń do pobierania i instalacji\n" +"pakietów. Najczęściej używane polecenia to update i install.\n" "\n" "Polecenia:\n" -" update - Pobierz nowe listy pakietów\n" -" upgrade - Wykonaj aktualizacjê\n" -" install - Zainstaluj nowe pakiety (pakiet to np. libc6, nie libc6.deb)\n" -" remove - Usuñ pakiety\n" -" source - Pobierz archiwa ¼ród³owe\n" -" build-dep - Skonfiguruj zale¿no¶ci na czas budowania dla pakietów " -"¼ród³owych\n" +" update - Pobiera nowe listy pakietów\n" +" upgrade - Wykonuje aktualizację\n" +" install - Instaluje nowe pakiety (pakiet to np. libc6, nie libc6.deb)\n" +" remove - Usuwa pakiety\n" +" autoremove - Usuwa automatycznie wszystkie nieużywane pakiety\n" +" purge - Usuwa i czyści pakiety\n" +" source - Pobiera archiwa źródłowe\n" +" build-dep - Konfiguruje zależności na czas budowania dla pakietów " +"źródłowych\n" " dist-upgrade - Aktualizacja dystrybucji, patrz apt-get(8)\n" -" dselect-upgrade - Instaluj wed³ug wyborów dselect\n" -" clean - Usuñ pobrane pliki archiwów\n" -" autoclean - Usuñ stare pobrane pliki archiwów\n" -" check - Sprawd¼, czy wszystkie zale¿no¶ci s± spe³nione\n" +" dselect-upgrade - Instaluje według wyborów dselect\n" +" clean - Usuwa pobrane pliki archiwów\n" +" autoclean - Usuwa stare pobrane pliki archiwów\n" +" check - Sprawdza, czy wszystkie zależności są spełnione\n" "\n" "Opcje:\n" " -h Ten tekst pomocy.\n" -" -q Nie pokazuj wska¼nika postêpu (przydatne przy rejestrowaniu " -"dzia³ania)\n" -" -qq Nie wypisuj nic oprócz komunikatów b³êdów\n" -" -d Tylko pobierz - NIE instaluj ani nie rozpakowuj archiwów\n" -" -s Bez dzia³ania. Wykonaj tylko symulacjê ustawiania kolejno¶ci\n" -" -y Zak³adaj odpowied¼ \"tak\" na wszystkie pytania, nie pytaj\n" -" -f Próbuj dzia³aæ nawet je¶li zawiedzie sprawdzenie integralno¶ci\n" -" -m Próbuj dzia³aæ nawet je¶li nie mo¿na znale¼æ niektórych archiwów\n" -" -u Poka¿ te¿ listê aktualizowanych pakietów\n" -" -b Zbuduj pakiet po pobraniu archiwum ¼ród³owego\n" -" -V Poka¿ pe³n± informacjê na temat wersji\n" -" -c=? Czytaj ten plik konfiguracyjny.\n" -" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" -"Wiêcej informacji i opcji mo¿na znale¼æ na stronach podrêcznika\n" +" -q Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu " +"działania)\n" +" -qq Nie wypisuje nic oprócz komunikatów błędów\n" +" -d Tylko pobiera - NIE instaluje ani nie rozpakowuje archiwów\n" +" -s Bez działania. Wykonuje tylko symulację ustalenia kolejności\n" +" -y Zakłada odpowiedź \"tak\" na wszystkie pytania, nie pyta\n" +" -f Próbuje naprawić system, w którym występują niespełnione zależności\n" +" -m Próbuje działać nawet jeśli nie można znaleźć niektórych archiwów\n" +" -u Pokazuje też listę aktualizowanych pakietów\n" +" -b Buduje pakiet po pobraniu archiwum źródłowego\n" +" -V Pokazuje pełną informację na temat wersji\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawie dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +"Więcej informacji i opcji można znaleźć na stronach podręcznika\n" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" @@ -1304,7 +1355,7 @@ msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "B³±d " +msgstr "Błąd " #: cmdline/acqprogress.cc:135 #, c-format @@ -1314,7 +1365,7 @@ msgstr "Pobrano %sB w %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Pracujê]" +msgstr " [Pracuje]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1323,13 +1374,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Zmiana no¶nika: Proszê w³o¿yæ dysk oznaczony\n" -" '%s'\n" -"do napêdu '%s' i nacisn±æ enter\n" +"Zmiana nośnika: Proszę włożyć dysk oznaczony\n" +" \"%s\"\n" +"do napędu \"%s\" i nacisnąć enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Nieznany rekord pakietu!" +msgstr "Nieznane informacje o pakiecie!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1344,490 +1395,496 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"U¿ycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n" +"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n" "\n" -"apt-sortpkgs to proste narzêdzie s³u¿±ce do sortowania plików pakietów.\n" -"Opcji -s u¿ywa siê do wskazania typu pliku.\n" +"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n" +"Opcji -s używa się do wskazania typu pliku.\n" "\n" "Opcje:\n" " -h Ten tekst pomocy.\n" -" -s Sortowanie pliku ¼róde³.\n" -" -c=? Czytaj ten plik konfiguracyjny.\n" -" -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n" +" -s Sortowanie pliku źródeł.\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Nieprawid³owe ustawienie domy¶lne!" +msgstr "Nieprawidłowe ustawienie domyślne!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Naci¶nij enter, aby kontynuowaæ." +msgstr "Proszę nacisnąć enter, aby kontynuować." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Usunąć wszystkie pobrane wcześniej pliki .deb?" # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Wyst±pi³y problemy przy rozpakowywaniu. Zainstalowane pakiety zostan±" +msgstr "Wystąpiły problemy przy rozpakowywaniu. Zainstalowane pakiety zostaną" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" -msgstr "skonfigurowane. Mo¿e to spowodowaæ podwójne b³êdy lub b³êdy" +msgstr "skonfigurowane. Może to spowodować podwójne błędy lub błędy" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"spowodowane brakuj±cymi zale¿no¶ciami. To jest normalne. Tylko powy¿sze" +"spowodowane brakującymi zależnościami. To jest normalne. Tylko powyższe" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "b³êdy s± istotne. Proszê je poprawiæ i ponownie wybraæ [I]nstalacjê." +msgstr "błędy są istotne. Proszę je poprawić i ponownie wybrać [I]nstalację." #: dselect/update:30 msgid "Merging available information" -msgstr "£±czenie informacji o dostêpnych pakietach" +msgstr "Łączenie informacji o dostępnych pakietach" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Nie uda³o siê utworzyæ potoków" +msgstr "Nie udało się utworzyć potoków" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Nie uda³o uruchomiæ programu gzip " +msgstr "Nie udało się uruchomić programu gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Nieznany typ nag³ówka TAR %u, sk³adnik %s" +msgstr "Nieznany typ nagłówka TAR %u, składnik %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "Nieprawid³owy podpis archiwum" +msgstr "Nieprawidłowy podpis archiwum" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "B³±d przy czytaniu nag³ówka sk³adnika archiwum" +msgstr "Błąd przy czytaniu nagłówka składnika archiwum" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Nieprawid³owy nag³ówek sk³adnika archiwum" +msgstr "Nieprawidłowy nagłówek składnika archiwum" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "Archiwum jest za krótkie" +msgstr "Archiwum jest za krótkie" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Nie uda³o siê odczytaæ nag³ówków archiwum" +msgstr "Nie udało się odczytać nagłówków archiwum" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode wywo³ane na wci±¿ pod³±czonym wê¼le" +msgstr "DropNode wywołane na wciąż podłączonym węźle" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Nie uda³o siê odnale¼æ elementu hasha!" +msgstr "Nie udało się odnaleźć elementu tablicy haszującej!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Nie uda³o siê utworzyæ objazdu" +msgstr "Nie udało się utworzyć ominięcia" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "B³±d wewnêtrzny w AddDiversion" +msgstr "Błąd wewnętrzny w AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Próba nadpisania objazdu, %s -> %s i %s/%s" +msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Podwójne dodanie objazdu %s -> %s" +msgstr "Podwójne dodanie ominięcia %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Nie uda³o siê zapisaæ pliku %s" +msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Nie uda³o siê zamkn±æ pliku %s" +msgstr "Nie udało się zamknąć pliku %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "¦cie¿ka %s jest zbyt d³uga" +msgstr "Ścieżka %s jest zbyt długa" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Wypakowanie %s wiêcej ni¿ raz" +msgstr "Wypakowanie %s więcej niż raz" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "Objazd katalogu %s" +msgstr "Ominięcie katalogu %s" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pakiet próbuje pisaæ do celu objazdu %s/%s" +msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Zbyt d³uga ¶cie¿ka objazdu" +msgstr "Zbyt długa ścieżka ominięcia" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Katalog %s zosta³ zast±piony obiektem nie bêd±cym katalogiem" +msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Nie uda³o siê znale¼æ wêz³a w jego kube³ku haszuj±cym" +msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "¦cie¿ka jest zbyt d³uga" +msgstr "Ścieżka jest zbyt długa" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Dopasowanie dla %s nadpisuj±cego pakietu bez wersji" +msgstr "Dopasowanie dla %s nadpisującego pakietu bez wersji" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Nie mo¿na czytaæ %s" +msgstr "Nie można czytać %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Nie mo¿na wykonaæ operacji stat na %s" +msgstr "Nie można wykonać operacji stat na %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Nie uda³o siê usun±æ %s" +msgstr "Nie udało się usunąć %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Nie mo¿na utworzyæ %s" +msgstr "Nie można utworzyć %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Nie uda³o siê wykonaæ operacji stat na %sinfo" +msgstr "Nie udało się wykonać operacji stat na %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Pliki info i temp musz± byæ na tym samym systemie plików" +msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Czytanie list pakietów" +msgstr "Czytanie list pakietów" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Nie uda³o siê przej¶æ do katalogu administracyjnego %sinfo" +msgstr "Nie udało się przejść do katalogu administracyjnego %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "B³±d wewnêtrzny podczas pobierania nazwy pakietu" +msgstr "Błąd wewnętrzny podczas pobierania nazwy pakietu" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Czytanie listy plików" +msgstr "Czytanie listy plików" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Nie uda³o siê otworzyæ pliku listy '%sinfo/%s'. Je¶li nie mo¿esz przywróciæ " -"tego pliku, utwórz go jako pusty plik i bezzw³ocznie przeinstaluj tê sam± " -"wersjê pakietu!" +"Nie udało się otworzyć pliku listy \"%sinfo/%s\". Jeśli nie można przywrócić " +"tego pliku, należy utworzyć go jako pusty plik i bezzwłocznie przeinstalować " +"tę samą wersję pakietu!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Nie uda³o siê przeczytaæ pliku listy %sinfo/%s" +msgstr "Nie udało się przeczytać pliku listy %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "B³±d wewnêtrzny przy pobieraniu wêz³a" +msgstr "Błąd wewnętrzny przy pobieraniu węzła" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Nie uda³o siê otworzyæ pliku objazdów %sdiversions" +msgstr "Nie udało się otworzyć pliku ominięć %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Plik objazdów jest uszkodzony" +msgstr "Plik ominięć jest uszkodzony" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Nieprawid³owa linia w pliku objazdów: %s" +msgstr "Nieprawidłowa linia w pliku ominięć: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "B³±d wewnêtrzny przy dodawaniu objazdu" +msgstr "Błąd wewnętrzny przy dodawaniu ominięcia" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Magazyn podrêczny pakietów musi wcze¶niej zostaæ zainicjalizowany" +msgstr "Magazyn podręczny pakietów musi wcześniej zostać zainicjalizowany" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Nie uda³o siê znale¼æ nag³ówka Package:, offset %lu" +msgstr "Nie udało się znaleźć nagłówka Package:, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "B³êdna sekcja ConfFile w pliku stanu. Offset %lu" +msgstr "Błędna sekcja ConfFile w pliku stanu. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "B³±d przy czytaniu skrótu MD5. Offset %lu" +msgstr "Błąd przy czytaniu skrótu MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "To nie jest poprawne archiwum DEB, brakuje sk³adnika '%s'" +msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\"" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "To nie jest poprawne archiwum DEB, brakuje sk³adnika '%s' lub '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"To nie jest poprawne archiwum DEB, brakuje składnika \"%s\", \"%s\" lub \"%s" +"\"" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Nie uda³o siê przej¶æ do %s" +msgstr "Nie udało się przejść do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "B³±d wewnêtrzny, nie uda³o siê odnale¼æ sk³adnika" +msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Nie uda³o siê odnale¼æ poprawnego pliku control" +msgstr "Nie udało się odnaleźć poprawnego pliku control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Plik kontrolny nie mo¿e zostaæ poprawnie zinterpretowany" +msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Nie mo¿na odczytaæ bazy danych CD-ROM-ów %s" +msgstr "Nie można odczytać bazy danych CD-ROM-ów %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 "" -"Proszê u¿yæ programu apt-cdrom, aby APT móg³ rozpoznaæ tê p³ytê CD. Nowych " -"p³yt nie mo¿na dodawaæ przy pomocy polecenia apt-get update" +"Proszę użyć programu apt-cdrom, aby APT mógł rozpoznać tę płytę CD. Nowych " +"płyt nie można dodawać przy pomocy polecenia apt-get update" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Niew³a¶ciwa p³yta CD" +msgstr "Niewłaściwa płyta CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Nie uda³o siê odmontowaæ CD-ROM-u w %s, byæ mo¿e wci±¿ jest u¿ywany." +msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używany." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Nie uda³o siê wykonaæ operacji stat" +msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Nie uda³o siê ustawiæ czasu modyfikacji" +msgstr "Nie udało się ustawić czasu modyfikacji" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Nieprawid³owe URI, lokalne URI nie mog± zaczynaæ siê od //" +msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Rejestrowanie siê" +msgstr "Logowanie się" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Nie mo¿na okre¶liæ nazwy zdalnego systemu" +msgstr "Nie można określić nazwy zdalnego systemu" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Nie uda³o siê okre¶liæ nazwy lokalnego systemu" +msgstr "Nie udało się określić nazwy lokalnego systemu" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Serwer odrzuci³ nasze po³±czenie i powiedzia³: %s" +msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Polecenie USER nie powiod³o siê, serwer powiedzia³: %s" +msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Polecenie PASS nie powiod³o siê, serwer powiedzia³: %s" +msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Okre¶lono serwer po¶rednicz±cy, ale nie okre¶lono skryptu rejestrowania, " +"Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, " "Acquire::ftp::ProxyLogin jest puste." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -"Polecenie skryptu rejestrowania '%s' nie powiod³o siê, serwer powiedzia³: %s" +"Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: %" +"s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Polecenie TYPE nie powiod³o siê, serwer powiedzia³: %s" +msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Przekroczenie czasu po³±czenia" +msgstr "Przekroczenie czasu połączenia" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Serwer zamkn±³ po³±czenie" +msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" -msgstr "B³±d odczytu" +msgstr "Błąd odczytu" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Odpowied¼ przepe³ni³a bufor." +msgstr "Odpowiedź przepełniła bufor." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Naruszenie zasad protoko³u" +msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "B³±d zapisu" +msgstr "Błąd zapisu" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Nie uda³o siê utworzyæ gniazda" +msgstr "Nie udało się utworzyć gniazda" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Nie uda³o siê po³±czyæ gniazda danych, przekroczenie czasu po³±czenia" +msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Nie uda³o siê po³±czyæ pasywnego gniazda." +msgstr "Nie udało się połączyć pasywnego gniazda." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo nie by³o w stanie uzyskaæ s³uchaj±cego gniazda" +msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Nie uda³o siê przy³±czyæ gniazda" +msgstr "Nie udało się przyłączyć gniazda" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Nie uda³o siê s³uchaæ na gnie¼dzie" +msgstr "Nie udało się nasłuchiwać na gnieździe" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Nie uda³o siê okre¶liæ nazwy gniazda" +msgstr "Nie udało się określić nazwy gniazda" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "Nie mo¿na wys³aæ polecenia PORT" +msgstr "Nie można wysłać polecenia PORT" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Nieznana rodzina adresów %u (AF_*)" +msgstr "Nieznana rodzina adresów %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Polecenie EPRT nie powiod³o siê, serwer powiedzia³: %s" +msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Przekroczony czas po³±czenia gniazda danych" +msgstr "Przekroczony czas połączenia gniazda danych" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "Nie uda³o siê przyj±æ po³±czenia" +msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Nie uda³o siê obliczyæ skrótu pliku" +msgstr "Nie udało się obliczyć skrótu pliku" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Nie mo¿na pobraæ pliku, serwer powiedzia³ '%s'" +msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1836,7 +1893,7 @@ msgstr "Przekroczony czas oczekiwania na dane" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Nie uda³o siê przes³aæ danych, serwer powiedzia³ '%s'" +msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s" #. Get the files information #: methods/ftp.cc:997 @@ -1845,961 +1902,1030 @@ msgstr "Info" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "Nie mo¿na wywo³aæ " +msgstr "Nie można wywołać " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Pod³±czanie do %s (%s)" +msgstr "Podłączanie do %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Nie uda³o siê utworzyæ gniazda dla %s (f=%u t=%u p=%u)" +msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Nie uda³o siê zainicjalizowaæ po³±czenia z %s:%s (%s)." +msgstr "Nie udało się zainicjalizować połączenia z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s), przekroczenie czasu po³±czenia" +msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Nie uda³o siê po³±czyæ z %s:%s (%s)." +msgstr "Nie udało się połączyć z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "£±czenie z %s" +msgstr "Łączenie z %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'" +msgstr "Nie udało się przetłumaczyć nazwy \"%s\"" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Tymczasowy b³±d przy t³umaczeniu '%s'" +msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Co¶ niegodziwego sta³o siê przy t³umaczeniu '%s:%s' (%i)" +msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Nie uda³o siê po³±czyæ z %s %s:" +msgstr "Nie udało się połączyć z %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'" +msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\"" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt d³uga. Wychodzimy." +msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"B³±d wewnêtrzny: Prawid³owa sygnatura, ale nie nie uda³o siê ustaliæ " -"jejodcisku?!" +"Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku " +"klucza?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Napotkano przynajmniej jedn± nieprawid³ow± sygnaturê." +msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:213 -#, fuzzy, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " by zweryfikowaæ sygnaturê (czy gnupg jest zainstalowane?)" +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" +"Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest " +"zainstalowane?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "Nieznany b³±d podczas uruchamiania gpgv" +msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "Nastêpuj±ce sygnatury by³y b³êdne:\n" +msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Nastêpuj±ce sygnatury nie mog³y zostaæ zweryfikowane z powodu braku klucza " +"Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Nie uda³o siê otworzyæ potoku dla %s" +msgstr "Nie udało się otworzyć potoku dla %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "B³±d odczytu z procesu %s" +msgstr "Błąd odczytu z procesu %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Oczekiwanie na nag³ówki" +msgstr "Oczekiwanie na nagłówki" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" -msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków" +msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" -msgstr "Nieprawid³owa linia nag³ówka" +msgstr "Nieprawidłowa linia nagłówka" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi" +msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length" +msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range" +msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)" +msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" -msgstr "Operacja select nie powiod³a siê" +msgstr "Operacja select nie powiodła się" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" -msgstr "Przekroczenie czasu po³±czenia" +msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "B³±d przy pisaniu do pliku wyj¶ciowego" +msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "B³±d przy pisaniu do pliku" +msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "B³±d przy pisaniu do pliku" +msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie" +msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "B³±d czytania z serwera" +msgstr "Błąd czytania z serwera" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Nie udało się uciąć zawartości pliku %s" -#: methods/http.cc:1106 +#: methods/http.cc:1105 msgid "Bad header data" -msgstr "B³êdne dane nag³ówka" +msgstr "Błędne dane nagłówka" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Po³±czenie nie uda³o siê" +msgstr "Połączenie nie udało się" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" -msgstr "B³±d wewnêtrzny" +msgstr "Błąd wewnętrzny" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Nie mo¿na wykonaæ mmap na pustym pliku" +msgstr "Nie można wykonać mmap na pustym pliku" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Nie uda³o siê wykonaæ mmap %lu bajtów" +msgstr "Nie udało się wykonać mmap %lu bajtów" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nierozpoznany skrót typu: '%c'" +msgstr "Nierozpoznany skrót typu: \"%c\"" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linia %d jest zbyt d³uga (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "B³±d sk³adniowy %s:%u: Blok nie zaczyna siê nazw±." +msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "B³±d sk³adniowy %s:%u: B³êdny znacznik" +msgstr "Błąd składniowy %s:%u: Błędny znacznik" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "B³±d sk³adniowy %s:%u: Po warto¶ci wystêpuj± ¶mieci" +msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"B³±d sk³adniowy %s:%u: Dyrektywy mog± wystêpowaæ tylko na poziomie najwy¿szym" +"Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "B³±d sk³adniowy %s:%u: Zbyt wiele zagnie¿d¿onych operacji include" +msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "B³±d sk³adniowy %s:%u: W³±czony tutaj" +msgstr "Błąd składniowy %s:%u: Włączony tutaj" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "B³±d sk³adniowy %s:%u: Nieobs³ugiwana dyrektywa '%s'" +msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "B³±d sk³adniowy %s:%u: ¦mieci na koñcu pliku" +msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... B³±d!" +msgstr "%c%s... Błąd!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Gotowe" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Opcja linii poleceñ '%c' [z %s] jest nieznana." +msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Niezrozumia³a opcja linii poleceñ %s" +msgstr "Niezrozumiała opcja linii poleceń %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Opcja linii poleceñ %s nie jest typu boolean" +msgstr "Opcja linii poleceń %s nie jest typu boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opcja %s wymaga argumentu." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawieraæ =." +msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Opcja %s wymaga argumentu typu ca³kowitego, nie '%s'" +msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Opcja '%s' jest zbyt d³uga" +msgstr "Opcja \"%s\" jest zbyt długa" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Znaczenie %s jest nieznane, spróbuj true albo false." +msgstr "Znaczenie %s jest nieznane, spróbuj true albo false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "Nieprawid³owa operacja %s" +msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Nie uda³o siê wykonaæ operacji stat na punkcie montowania %s" +msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Nie uda³o siê przej¶æ do %s" +msgstr "Nie udało się przejść do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Nie uda³o siê wykonaæ operacji stat na CDROM-ie" +msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie u¿yta blokada" +msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Nie uda³o siê otworzyæ pliku blokady %s" +msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie u¿yta blokada" +msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "Nie uda³o siê uzyskaæ blokady %s" +msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Oczekiwano na proces %s, ale nie by³o go" +msgstr "Oczekiwano na proces %s, ale nie było go" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Podproces %s spowodowa³ naruszenie segmentacji." +msgstr "Podproces %s spowodował naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Podproces %s zwróci³ kod b³êdu (%u)" +msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Podproces %s zakoñczy³ siê niespodziewanie" +msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "Nie uda³o siê otworzyæ pliku %s" +msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "nale¿a³o przeczytaæ jeszcze %lu, ale nic nie zosta³o" +msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "nale¿a³o zapisaæ jeszcze %lu, ale nie uda³o siê to" +msgstr "należało zapisać jeszcze %lu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Pusty magazyn podrêczny pakietów" +msgstr "Pusty magazyn podręczny pakietów" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Magazyn podrêczny pakietów jest uszkodzony" +msgstr "Magazyn podręczny pakietów jest uszkodzony" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Magazyn podrêczny pakietów jest w niezgodnej wersji" +msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Ta wersja APT nie obs³uguje systemu wersji '%s'" +msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Ten magazyn podrêczny pakietów zosta³ zbudowany dla innej architektury" +msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Wymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreWymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugeruje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Poleca" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Jest w konflikcie z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" -msgstr "Zastêpuje" +msgstr "Zastępuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "Czyni zbêdnym" +msgstr "Czyni zbędnym" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Psuje" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "important" -msgstr "wa¿ny" +msgstr "ważny" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "wymagany" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardowy" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcjonalny" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Budowanie drzewa zale¿no¶ci" +msgstr "Budowanie drzewa zależności" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" -msgstr "Kandyduj±ce wersje" +msgstr "Kandydujące wersje" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" -msgstr "Generowanie zale¿no¶ci" +msgstr "Generowanie zależności" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Odczyt informacji o stanie" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Nie udało się otworzyć pliku stanu %s" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Nie udało się zapisać tymczasowego pliku stanu %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (1)" +msgstr "Nie udało się zanalizować pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)" +msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (URI)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (dystrybucja)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza URI)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (bezwzglêdna dystrybucja)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Nieprawid³owa linia %lu w li¶cie ¼róde³ %s (analiza dystrybucji)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "Linia %u w li¶cie ¼róde³ %s jest zbyt d³uga." +msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (typ)" +msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ '%s' jest nieznany w linii %u listy ¼róde³ %s" +msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (identyfikator producenta)" +msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"To uruchomienie programu bêdzie wymaga³o tymczasowego usuniêcia istotnego " -"pakietu %s z powodu pêtli konfliktów/pre-zale¿no¶ci. Czêsto nie oznacza to " -"nic dobrego, ale je¶li naprawdê chcesz to zrobiæ, w³±cz opcjê APT::Force-" +"To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego " +"pakietu %s z powodu pętli konfliktów/pre-zależności. Często nie oznacza to " +"nic dobrego, ale jeśli naprawdę chcesz to zrobić, włącz opcję APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany" +msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum." +"Pakiet %s ma zostać przeinstalowany, ale nie można znaleźć jego archiwum." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane " -"\"zatrzymanymi\" pakietami." +"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " +"zatrzymanymi pakietami." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Nie uda³o siê naprawiæ problemów, zatrzymano uszkodzone pakiety." +msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub " +"została użyta ich starsza wersja." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Brakuje katalogu archiwów %spartial." +msgstr "Brakuje katalogu archiwów %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:828 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Pobieranie pliku %li z %li (%s pozosta³o)" +msgstr "Pobieranie pliku %li z %li (%s pozostało)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Czytanie listy plików" +msgstr "Pobieranie pliku %li z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "Nie uda³o siê odnale¼æ sterownika metody %s." +msgstr "Nie udało się odnaleźć sterownika metody %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "Metoda %s nie uruchomi³a siê poprawnie." +msgstr "Metoda %s nie uruchomiła się poprawnie" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "W³ó¿ do napêdu '%s' dysk o nazwie: '%s' i naci¶nij enter." +msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "System pakietów '%s' nie jest obs³ugiwany" +msgstr "System pakietów \"%s\" nie jest obsługiwany" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów" +msgstr "Nie udało się określić odpowiedniego typu systemu pakietów" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Nie uda³o siê wykonaæ operacji stat na pliku %s." +msgstr "Nie udało się wykonać operacji stat na pliku %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Nale¿y dopisaæ jakie¶ URI 'source' do pliku sources.list" +msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "Nie uda³o siê otworzyæ lub zanalizowaæ zawarto¶ci list pakietów." +msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Nale¿y uruchomiæ apt-get update aby naprawiæ te problemy." +msgstr "Należy uruchomić apt-get update aby naprawić te problemy." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Nieprawid³owy rekord w pliku ustawieñ, brak nag³ówka Package" +msgstr "Nieprawidłowe informacje w pliku ustawień, brak nagłówka Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Brak (lub zerowy) priorytet przypiêcia" +msgstr "Brak (lub zerowy) priorytet przypięcia" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Magazyn podrêczny ma niezgodny system wersji" +msgstr "Magazyn podręczny ma niezgodny system wersji" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewPackage)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage1)" +msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage2)" +msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileVer1)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion1)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage3)" +msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion2)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Och, przekroczono liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ." +"Och, przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Och, przekroczono liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ." +msgstr "Och, przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Och, przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Och, przekroczono liczbê zale¿no¶ci, któr± ten APT jest w stanie obs³u¿yæ." +"Och, przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (FindPkg)" +msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (CollectFileProvides)" +msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Pakiet %s %s nie zosta³ odnaleziony podczas przetwarzania zale¿no¶ci plików" +"Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Nie uda³o siê wykonaæ operacji stat na li¶cie pakietów ¼ród³owych %s" +msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Zbieranie zapewnieñ plików" +msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³" +msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" +msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "B³êdna suma MD5" +msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Błędna suma kontrolna" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "Dla nastêpuj±cego identyfikatora klucza brakuje klucza publicznego:\n" +msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " -"bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)." +"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " +"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " -"bêdzie rêcznie naprawiæ ten pakiet." +"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " +"będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s." +"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "B³êdny rozmiar" +msgstr "Błędny rozmiar" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Wykorzystuê %s jako punkt montowania CD-ROMu\n" +"Użycie %s jako punktu montowania CD-ROMu\n" "Montowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identyfikacja.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Odmontowanie CD-ROMu...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Wykorzystujê %s jako punkt montowania CD-ROMu\n" +msgstr "Użycie %s jako punktu montowania CD-ROMu\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "Oczekiwanie na p³ytê...\n" +msgstr "Oczekiwanie na płytę...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROMu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Skawnowanie p³yty w poszukiwaniu plików indeksu..\n" +msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych, %i indeksów " -"t³umaczeñ i %i sygnatur\n" +"Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów " +"tłumaczeń i %zu podpisów\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Znaleziono etykietę \"%s\"\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "To nie jest prawid³owa nazwa, spróbuj ponownie.\n" +msgstr "To nie jest prawidłowa nazwa, spróbuj ponownie.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"P³yta nosi nazwê: \n" -"'%s'\n" +"Płyta nosi nazwę: \n" +"\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "Kopiowanie list pakietów..." +msgstr "Kopiowanie list pakietów..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "Zapisywanie nowej listy ¼róde³\n" +msgstr "Zapisywanie nowej listy źródeł\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "¬ród³a dla tej p³yty to:\n" +msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Odmontowanie CD-ROMu..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" -msgstr "Zapisano %i rekordów.\n" +msgstr "Zapisano %i rekordów.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami.\n" +msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapisano %i rekordów z %i niepasuj±cymi plikami\n" +msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Zapisano %i rekordów z %i brakuj±cymi plikami i %i niepasuj±cymi\n" +msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Instalowanie %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Konfigurowanie %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Uruchamianie wyzwalacza post-installation %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Brakuje katalogu \"%s\"" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Przygotowanie %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Konfigurowanie %s" +msgid "Processing triggers for %s" +msgstr "Przetwarzanie wyzwalaczy dla %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr " Zainstalowany %s" +msgstr "Zainstalowany %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Przygotowanie do usuniêcia %s" +msgstr "Przygotowanie do usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Usuwanie %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "Usuniêto %s" +msgstr "Usunięto %s" -#: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format msgid "Preparing to completely remove %s" -msgstr "Przygotowanie do konfiguracji %s" +msgstr "Przygotowanie do całkowitego usunięcia %s" -#: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format msgid "Completely removed %s" -msgstr "Nie uda³o siê usun±æ %s" +msgstr "Całkowicie usunięto %s" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie " +"zamontowane?)\n" #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "Nie uda³o siê na³o¿yæ ³atki na plik" +msgstr "Nie udało się nałożyć łatki na plik" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie" - -#~ msgid "File date has changed %s" -#~ msgstr "Data pliku uleg³a zmianie %s" +msgstr "Połączenie zostało zamknięte przedwcześnie" -#~ msgid "Reading file list" -#~ msgstr "Czytanie listy plików" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Brak miejsca dla dynamicznego MMap" -#~ msgid "Could not execute " -#~ msgstr "Nie uda³o siê uruchomiæ " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "Przygotowanie do usuniêcia %s wraz z konfiguracj±" - -#~ msgid "Removed with config %s" -#~ msgstr "Usuniêto %s wraz z konfiguracj±" - -#~ msgid "Total Distinct Descriptions: " -#~ msgstr "W sumie ró¿nych opisów: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "W sumie zale¿no¶ci opis/plik: " - -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc1)" - -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc2)" - -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#~ 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 "" -#~ "Och, przekroczono liczbê opisów, któr± ten APT jest w stanie obs³u¿yæ." +#~ "Ponieważ zażądano tylko jednej operacji, jest bardzo prawdopodobne, że\n" +#~ "danego pakietu po prostu nie da się zainstalować i należy zgłosić w nim\n" +#~ "błąd." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linia %d jest zbyt długa (max %lu)" diff --git a/po/pt.po b/po/pt.po index b19459a..8ef181e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,160 +1,168 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. -# Miguel Figueiredo , 2005, 2006. +# Miguel Figueiredo , 2005, 2006, 2007, 2008. # # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-14 21:55+0100\n" -"Last-Translator: Rui Az. \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-09-09 20:54+0100\n" +"Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Impossível encontrar o pacote %s" +msgstr "Não foi possível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Total de Nomes de Pacotes : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Total de nomes de pacotes: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " Pacotes Normais: " +msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " Pacotes Puramente Virtuais: " +msgstr " Pacotes puramente virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " Pacotes Virtuais Únicos: " +msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Pacotes Virtuais Misturados: " +msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltam: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "Total de Versões Distintas: " +msgstr "Total de versões distintas: " + +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Total de descrições distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "Total de Dependências: " +msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "Total de relações Ver/Ficheiro: " +msgstr "Total de relações ver/ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Total de relações Desc/Ficheiro: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "Total de Mapeamentos Disponibilizados: " +msgstr "Total de Mapeamentos 'Provides': " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Total de Strings Globbed: " +msgstr "Total de strings globbed: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Total de espaço de Dependência de Versão: " +msgstr "Espaço total de dependência de versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Total de espaço Desperdiçado: " +msgstr "Espaço total desperdiçado: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Total de Espaço Contabilizado: " +msgstr "Espaço total contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Você deve dar exactamente um pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pacotes Marcados: " -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s para %s %s compilado em %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +185,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -202,31 +210,32 @@ msgstr "" "neles\n" "\n" "Comandos:\n" -" add - Adiciona um ficheiro de pacote à cache de fontes\n" -" gencaches - Constrói ambas as caches de pacotes e de fontes\n" -" showpkg - Mostra informações gerais sobre um pacote\n" -" showsrc - Mostra registros de fontes\n" -" stats - Mostra estatísticas básicas\n" -" dump - Mostra o ficheiro inteiro de forma concisa\n" -" dumpavail - Imprime um ficheiro disponível para stdout\n" -" unmet - Mostra dependências não satisfeitas\n" -" search - Procura na lista de pacotes por um pattern regex\n" -" show - Mostra um registro legível sobre o pacote\n" -" depends - Mostra informações em bruto de dependências de um pacote\n" -" pkgnames - Lista o nome de todos os pacotes\n" -" dotty - Gera gráficos de pacotes para o GraphVis\n" -" xvcg - Gera gráficos de pacotes para o xvcg\n" -" policy - Mostra as configurações de políticas\n" +" add - Adicionar um ficheiro de pacote à cache de código-fonte\n" +" gencaches - Construir as caches de pacotes e de fontes\n" +" showpkg - Mostrar informações gerais sobre um pacote\n" +" showsrc - Mostrar registros de código-fonte\n" +" stats - Mostrar algumas estatísticas simples\n" +" dump - Mostrar todo o ficheiro de forma concisa\n" +" dumpavail - Imprimir um ficheiro disponível para stdout\n" +" unmet - Mostrar dependências não satisfeitas\n" +" search - Procurar na lista de pacotes por um padrão regex\n" +" show - Mostrar um registro legível sobre o pacote\n" +" depends - Mostrar informações em bruto de dependências de um pacote\n" +" pkgnames - Listar o nome de todos os pacotes no sistema\n" +" dotty - Gerar gráficos de pacotes para o GraphViz\n" +" xvcg - Gerar gráficos de pacotes para o xvcg\n" +" policy - Mostrar as configurações de políticas\n" "\n" "Opções:\n" " -h Este texto de ajuda.\n" " -p=? A cache de pacotes.\n" " -s=? A cache de fontes.\n" -" -q Desabilita o indicador de progresso.\n" -" -i Mostra apenas dependências importantes para o comando unmet.\n" +" -q Desabilitar o indicador de progresso.\n" +" -i Mostrar apenas dependências importantes para o comando unmet.\n" " -c=? Ler o ficheiro de configuração especificado.\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -"Veja as páginas do manual apt-cache(8) e apt.conf(5) para mais informações.\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" +"Para mais informações veja as páginas do manual 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'" @@ -243,7 +252,7 @@ msgstr "Repita este processo para o resto dos CDs no seu conjunto." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumentos não estão em pares" +msgstr "os argumentos não estão em pares" #: cmdline/apt-config.cc:76 msgid "" @@ -262,17 +271,17 @@ msgid "" msgstr "" "Utilização: apt-config [opções] comando\n" "\n" -"O apt-config é uma ferramenta simples para ler o ficheiro de configuração\n" -"do APT\n" +"O apt-config é uma ferramenta simples para ler o ficheiro de config do APT\n" "\n" "Comandos:\n" -" shell - Modo Shell\n" -" dump - Mostra a configuração\n" +" shell - Modo shell\n" +" dump - Mostrar a configuração\n" "\n" "Opções:\n" " -h Este texto de ajuda.\n" -" -c=? Ler este arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -299,44 +308,45 @@ msgstr "" "\n" "Opções:\n" " -h Este texto de ajuda\n" -" -t Define o directório temporário\n" -" -c=? Ler este arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -t Definir o directório temporário\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" -msgstr "Impossível escrever para %s" +msgstr "Não conseguiu escrever para %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" +msgstr "Não pode obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "Lista de extensão de pacotes é demasiado longa" +msgstr "A lista de extensão de pacotes é demasiado longa" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Erro processando o directório %s" +msgstr "Erro ao processar o directório %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "Lista de extensão de fontes é demasiado longa" +msgstr "Lista de extensão de códigos-fonte é demasiado longa" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Erro ao gravar cabeçalho no ficheiro de conteúdo" +msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Erro processando o ficheiro Contents %s" +msgstr "Erro ao processar o conteúdo %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -391,8 +401,8 @@ msgstr "" "\n" "O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n" " O ficheiro Package contém o conteúdo de todos os campos de controle de \n" -"cada pacote bem como o hash MD5 e tamanho do ficheiro. Um ficheiro \n" -"override é suportado para forçar o valor de Priority e Section.\n" +"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n" +"ficheiro override para forçar o valor de Priority e Section.\n" "\n" "Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n" "árvore de .dscs. A opção --source-override pode ser utilizada para \n" @@ -408,314 +418,314 @@ msgstr "" "\n" "Opções:\n" " -h Este texto de ajuda\n" -" --md5 Controla a criação do MD5\n" +" --md5 Controlar a criação do MD5\n" " -s=? Ficheiro override de código-fonte \n" -" -q Quieto\n" -" -d=? Selecciona a base de dados de caching opcional\n" -" --no-delink Habilita o modo de debug delinking\n" -" --contents Controla a criação do ficheiro de conteúdo\n" -" -c=? Lê este ficheiro de configuração\n" -" -o=? Define uma opção de configuração arbitrária" - -#: ftparchive/apt-ftparchive.cc:762 +" -q Silencioso\n" +" -d=? Seleccionar a base de dados de caching opcional\n" +" --no-delink Habilitar o modo de debug delinking\n" +" --contents Controlar a criação do ficheiro de conteúdo\n" +" -c=? Lêr este ficheiro de configuração\n" +" -o=? Definir uma opção de configuração arbitrária" + +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" +msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB é antiga, tentando uma actualização %s" +msgstr "A base de dados é antiga, a tentar actualizar %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -"O formato DB é inválido. Se actualizou a partir de uma versão antiga do apt, " -"por favor remova-a e recrie a base de dados." +"O formato da base de dados é inválido. Se actualizou a partir de uma versão " +"antiga do apt, por favor remova-a e crie novamente a base de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Não foi possível abrir o ficheiro DB %s: %s" +msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Falha ao executar stat %s" +msgstr "Falha stat %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "O arquivo não tem registro de controle" +msgstr "O arquivo não tem registro de controlo" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E: Erros aplicam-se ao ficheiro " +msgstr "E: Os erros aplicam-se ao ficheiro " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Falha ao resolver %s" +msgstr "Falhou resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Falhou ao abrir %s" +msgstr "Falhou abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Falhou ao executar readlink %s" +msgstr "Falhou o readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Falhou ao executar unlink %s" +msgstr "Falhou o unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Falhou ao ligar %s a %s" +msgstr "*** Falhou ligar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "Arquivo não possuía campo pacote" +msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " maintainer de %s é %s, não %s\n" +msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s não possui de igual modo entrada binária de 'override'\n" +msgstr " %s também não possui entrada binária de 'override'\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro Interno, não foi possível localizar o membro %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falha ao alocar memória" +msgstr "realloc - Falhou alocar memória" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Impossível abrir %s" +msgstr "Não foi possível abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Override malformado %s linha %lu #1" +msgstr "Override %s malformado linha %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Override malformado %s linha %lu #2" +msgstr "Override %s malformado linha %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Override malformado %s linha %lu #3" +msgstr "Override %s malformado linha %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Falha ao ler o ficheiro override %s" +msgstr "Falhou ler o ficheiro override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo de Compressão Desconhecido '%s'" +msgstr "Algoritmo de compressão desconhecido '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Falha ao criar FILE*" +msgstr "Falhou criar FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Falha ao executar fork" +msgstr "Falhou o fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Compactar Filho" +msgstr "Compactar filho" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Erro Interno, Falha ao criar %s" +msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Falha ao criar subprocesso IPC" +msgstr "Falhou criar subprocesso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Falha ao executar compressor " +msgstr "Falhou executar compactador " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "descompactador" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IO para subprocesso/arquivo falhou" +msgstr "Falhoi IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Falha ao ler durante o cálculo de MD5" +msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Falha ao renomear %s para %s" +msgstr "Falhou renomear %s para %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "mas não está instalável" +msgstr "mas não é instalável" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "Os seguintes NOVOS pacotes serão instalados:" +msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "Os seguintes pacotes serão REMOVIDOS:" +msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" +msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "Os seguintes pacotes serão actualizados:" +msgstr "Serão actualizados os seguintes pacotes:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "Aos seguintes pacotes será feito o DOWNGRADE :" +msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Os seguintes pacotes mantidos serão mudados :" +msgstr "Os seguintes pacotes mantidos serão mudados:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -723,145 +733,145 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Corrigindo dependências..." +msgstr "A corrigir dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "Impossível corrigir dependências" +msgstr "Não foi possível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Impossível minimizar o conjunto de actualizações" +msgstr "Não foi possível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" +msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Há problemas e -y foi usado sem --force-yes" +msgstr "Há problemas e foi utilizado -y sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Impossível criar lock no directório de download" +msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" +msgstr "É necessário obter %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "É necessário fazer o download de %sB de arquivos.\n" +msgstr "É necessário obter %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" +"Após esta operação, serão utilizados %sB adicionais de espaço em disco.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "Impossível de determinar espaço livre em %s" +msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Trivial Only especificado mas essa não é uma operação trivial." +msgstr "Trivial Only especificado mas isto não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,76 +882,76 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "Você deseja continuar [Y/n]? " +msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Falha ao obter %s %s\n" +msgstr "Falhou obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Download completo e em modo de apenas download" +msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " -"--fix-missing?" +"Não foi possível obter alguns arquivos, tente talvez correr apt-get update " +"ou tente com --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "Impossível corrigir os pacotes em falta." +msgstr "Não foi possível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." -msgstr "Abortando a Instalação." +msgstr "A abortar a instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota, seleccionando %s em vez de %s\n" +msgstr "Note, a seleccionar %s em vez de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "O pacote %s não está instalado, então não será removido\n" +msgstr "O pacote %s não está instalado, por isso não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -949,80 +959,124 @@ msgid "" "is only available from another source\n" msgstr "" "O pacote %s não está disponível, mas é referenciado por outro pacote.\n" -"Isso pode significar que o pacote falta, ficou obsoleto ou\n" +"Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s já é a versão mais recente.\n" +msgstr "%s já está na versão mais recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' para '%s' não foi encontrado" +msgstr "Não foi encontrado o Release '%s' para '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Versão '%s' para '%s' não foi encontrada" +msgstr "Não foi encontrada a versão '%s' para '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Impossível criar lock no directório de listas" +msgstr "Impossível criar acesso exclusivo ao directório de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Falhou o download de alguns ficheiros de índice, foram ignorados ou os " -"antigos foram usados em seu lugar." +"Os seguintes pacotes foram instalados automaticamente e já não são " +"necessários:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Utilize 'apt-get autoremove' para os remover." + +#: 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, parece que o AutoRemover destruiu algo que realmente não deveria ter\n" +"acontecido. Por favor arquive um relatório de bug contra o 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 "A seguinte informação pode ajudar a resolver a situação:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro Interno, o AutoRemover estragou coisas" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Não foi possível encontrar a tarefa %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" +msgstr "Note, a seleccionar %s para a expressão regular '%s'\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" +msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1084,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1039,180 +1093,165 @@ msgid "" msgstr "" "Alguns pacotes não puderam ser instalados. Isso pode significar que\n" "você solicitou uma situação impossível ou se você está a usar a\n" -"distribuição instável, que alguns pacotes requisitados ainda não foram \n" -"criados ou foram tirados do Incoming." +"distribuição unstable em que alguns pacotes pedidos ainda não foram \n" +"criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1569 -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 "" -"Já que você requisitou uma única operação é extremamente provável que o \n" -"pacote esteja simplesmente não instalável e deve ser enviado um relatório " -"de\n" -"bug sobre esse pacote." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A seguinte informação pode ajudar a resolver a situação:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "Pacotes sugeridos :" +msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" -msgstr "Pacotes recomendados :" +msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "Calculando Actualização... " +msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "" -"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" +msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "Impossível encontrar um pacote de código fonte para %s" +msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" +msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" +msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Precisa obter %sB de arquivos de código fonte.\n" +msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Obter Código Fonte %s\n" +msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Falha ao obter alguns arquivos." +msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -"Saltando a descompactação de pacote código fonte já descompactado em %s\n" +"A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Impossível obter informações de dependências de compilação para %s" +msgstr "" +"Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " +"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2282 +#: 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 "" -"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " +"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " -"novo" +"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " +"demasiado novo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Falha ao processar as dependências de compilação" +msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1227,6 +1266,8 @@ msgid "" " 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" @@ -1242,7 +1283,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1257,45 +1298,48 @@ msgstr "" " apt-get [opções] install|remove pacote1 [pacote2 ...]\n" " apt-get [opções] source pacote1 [pacote2 ...]\n" "\n" -"O apt-get é um interface simples de linha de comando para fazer o\n" -"download de pacotes e instalá-los. Os comandos usados mais frequentemente\n" -"são o update e install\n" +"O apt-get é um interface simples de linha de comandos para fazer\n" +"download e instalar pacotes. Os comandos utilizados mais frequentemente\n" +"são update e install.\n" "\n" "Comandos:\n" -" update - Obtém novas listas de pacotes\n" -" upgrade - Executa uma actualização\n" -" install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n" -" remove - Remove um pacote\n" -" source - Faz o download de arquivos de código fonte\n" -" build-dep - Configura as dependências de compilação de pacotes código " +" update - Obter novas listas de pacotes\n" +" upgrade - Executar uma actualização\n" +" install - Instalar novos pacotes (o pacote é libc6 e não libc6.deb)\n" +" remove - Remover pacotes\n" +" autoremove - Remover automaticamente todos os pacotes não utilizados\n" +" purge - Remover e purgar pacotes\n" +" source - Fazer o download de arquivos de código fonte\n" +" build-dep - Configurar as dependências de compilação de pacotes de código " "fonte\n" -" dist-upgrade - Actualiza a distribuição, consulte apt-get(8)\n" -" dselect-upgrade - Segue as selecções feitas do dselect\n" -" clean - Apaga arquivos obtidos para instalação\n" -" autoclean - Apaga arquivos antigos obtidos para instalação\n" -" check - Verifica se não há dependências erradas\n" +" dist-upgrade - Actualizar a distribuição, veja apt-get(8)\n" +" dselect-upgrade - Seguir as escolhas feitas no dselect\n" +" clean - Apagar ficheiros de arquivo obtidos\n" +" autoclean - Apagar ficheiros de arquivo antigos obtidos\n" +" check - Verificar se não existem dependências erradas\n" "\n" "Opções:\n" " -h Este texto de ajuda\n" -" -q Saída para log, excepto para erros\n" +" -q Saída para registo - sem indicador de progresso\n" " -qq Sem saída, excepto para erros\n" -" -d Fazer o download apenas - NÃO instalar ou descompactar arquivos\n" -" -s Não-agir. Executar simulação de ordenação\n" -" -y Assumir Sim para todas as perguntas, sem pedir confirmação\n" -" -f Tenta continuar se a verificação de integridade falhar\n" -" -m Tenta continuar se os arquivos não poderem ser localizados\n" -" -u Mostra uma lista também de pacotes actualizados\n" -" -b Compila o pacote fonte depois de fazer o download\n" -" -c=? Ler este arquivo de configuração\n" +" -d Fazer apenas o download - NÃO instalar ou descompactar arquivos\n" +" -s Não agir. Executar simulação de ordens\n" +" -y Assumir Sim para todas as perguntas e não fazer perguntas\n" +" -f Tentar corrigir um sistema com dependências erradas\n" +" -m Tentar continuar se os arquivos não poderem ser localizados\n" +" -u Mostrar também uma lista de pacotes actualizados\n" +" -b Compilar o pacote de código fonte depois de o obter\n" +" -V Mostrar números da versão detalhados\n" +" -c=? Ler este ficheiro de configuração\n" " -o=? Definir uma opção de configuração arbitrária, \n" -" ex -o dir::cache=/tmp\n" -"Veja as páginas do manual apt-get(8), sources.list(5) e apt.conf(5)\n" -"para mais informações e opções.\n" +" p.e. -o dir::cache=/tmp\n" +"Para mais informações e opções veja as páginas do manual apt-get(8),\n" +"sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "Atingido " +msgstr "Hit " #: cmdline/acqprogress.cc:79 msgid "Get:" @@ -1317,7 +1361,7 @@ msgstr "Obtidos %sB em %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Trabalhando]" +msgstr " [A trabalhar]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1328,11 +1372,11 @@ msgid "" msgstr "" "Troca de mídia: Por favor insira o disco chamado\n" " '%s'\n" -"na drive '%s' e pressione enter\n" +"no leitor '%s' e pressione enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Registro de pacote desconhecido!" +msgstr "Registo de pacote desconhecido!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1349,40 +1393,45 @@ msgid "" msgstr "" "Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n" "\n" -"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacote.\n" -"A opção -s é usada para indicar que tipo de ficheiro é.\n" +"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n" +"A opção -s é utilizada para indicar que tipo de ficheiro é.\n" "\n" "Opções:\n" " -h Este texto de ajuda\n" -" -s Usar ordenação de arquivo fonte\n" -" -c=? Ler este arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -s Utilizar a ordenação de ficheiros de código-fonte\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Configuração padrão Errada!" +msgstr "Configuração pré-definida errada!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Pressione enter para continuar." +msgstr "Carregue em enter para continuar." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Deseja apagar quaisquer ficheiros .deb obtidos previamente?" # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Alguns erros ocorreram ao descompactar. Irei configurar os pacotes" +msgstr "Ocorreram alguns erros ao descompactar. Vou configurar os pacotes" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "que foram instalados. Isto pode resultar em erros duplicados" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "causados por dependências em falta. Isto está OK, somente os erros" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1391,278 +1440,279 @@ msgstr "" #: dselect/update:30 msgid "Merging available information" -msgstr "Juntando informação Disponível" +msgstr "A juntar a informação disponível" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Falha ao criar pipes" +msgstr "Falhou a criação de pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Falha ao executar gzip " +msgstr "Falhou executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Checksum do arquivo tar falhou, arquivo corrompido" +msgstr "A soma de controlo do tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arquivo é demasiado pequeno" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Falha ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode chamado em nó ainda linkado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Falha ao localizar o elemento de hash !" +msgstr "Falha ao localizar o elemento de hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falha ao alocar desvio (diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro Interno em AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" +msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Falha ao escrever ficheiro %s" +msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Falha ao fechar ficheiro %s" +msgstr "Falhou fechar o ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é demasiado longo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Descompactando %s mais de uma vez" +msgstr "A descompactar %s mais de uma vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "O directório %s é desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O pacote está a tentar gravar no alvo de desvio %s/%s" +msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "O directório %s está sendo substituído por um não-directório" +msgstr "O directório %s está a ser substituído por um não-directório" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Falha ao localizar nó no seu hash bucket" +msgstr "Falhou localizar o nó no seu hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "O caminho é demasiado longo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s" +msgstr "Substituir o pacote correspondente sem versão para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" +msgstr "O ficheiro %s/%s substitui o que está no pacote %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Impossível ler %s" +msgstr "Não foi possível ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Impossível executar stat %s" +msgstr "Não foi possível fazer stat %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Falha ao remover %s" +msgstr "Falhou remover %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Impossível criar %s" +msgstr "Não foi capaz de criar %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Impossível executar stat %sinfo." +msgstr "Falhou stat %sinfo." -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" +msgstr "" +"Os directórios info e temp precisam estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "A Ler Listas de Pacotes" +msgstr "A ler as listas de pacotes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falha ao mudar para o directório administrativo %sinfo" +msgstr "Falhou mudar para o directório administrativo %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Erro Interno obtendo um Nome de Pacote" +msgstr "Erro Interno ao obter um nome de pacote" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Lendo Listagem de Ficheiros" +msgstr "A ler a listagem de ficheiros" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Falha ao abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga " -"restaurar este ficheiro, crie outro vazio e re-instale a mesma versão do " -"pacote !" +"Falha abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga restaurar " +"este ficheiro, crie outro vazio e reinstale imediatamente a a mesma versão " +"do pacote!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falha ao ler o ficheiro de lista %sinfo/%s" +msgstr "Falhou ler o ficheiro de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Erro Interno obtendo um Nó" +msgstr "Erro interno ao obter um nó" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falha ao abrir o ficheiro de desvios %sdiversions" +msgstr "Falhou abrir o ficheiro de desvios %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O ficheiro de desvios está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Linha inválida no ficheiro de desvio: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Erro Interno ao adicionar um desvio" +msgstr "Erro interno ao adicionar um desvio" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "A cache de pacotes tem de ser inicializada primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falha ao encontrar um Pacote: Cabeçalho, posição %lu" +msgstr "Falhou encontrar um Pacote: cabeçalho, posição %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erro ao fazer parse ao MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Este não é um arquivo DEB válido, falta o membro '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Este não é um arquivo DEB válido, não tem '%s' ou o membro '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Este não é um arquivo DEB válido, não tem '%s', '%s' ou o membro '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Não foi possível mudar para %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Erro Interno, não foi possível localizar membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Falha em localizar um ficheiro de controle válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Ficheiro de controle não interpretável" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossível ler a base de dados de cdrom %s" +msgstr "Não foi capaz de ler a base de dados de cdrom %s" #: methods/cdrom.cc:123 msgid "" @@ -1676,50 +1726,49 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD errado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." +msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Disco não encontrado" +msgstr "Disco não encontrado." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Arquivo não encontrado" +msgstr "Ficheiro não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Falha ao executar stat" +msgstr "Falhou o stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Falha ao definir hora de modificação" +msgstr "Falhou definir hora de modificação" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI inválido, URIs locais não devem iniciar com //" +msgstr "URI inválido, URIs locais não devem começar por //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "A entrar no sistema" +msgstr "A identificar-se no sistema" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Impossível determinar o nome do posto" +msgstr "Não foi possível determinar o nome do posto" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Impossível determinar o nome local" +msgstr "Não foi possível determinar o nome local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "O servidor recusou a nossa ligação e respondeu: %s" +msgstr "O servidor recusou a ligação e respondeu: %s" #: methods/ftp.cc:210 #, c-format @@ -1736,13 +1785,13 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Um servidor de proxy foi especificado mas não um script de login, Acquire::" +"Foi especificado um servidor de proxy mas não um script de login, Acquire::" "ftp::ProxyLogin está vazio." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Comando de script de login '%s' falhou, o servidor respondeu: %s" +msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" #: methods/ftp.cc:291 #, c-format @@ -1751,13 +1800,13 @@ msgstr "TYPE falhou, o servidor respondeu: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Tempo limite de ligação atingido" +msgstr "Foi atingido o tempo limite de ligação" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Servidor fechou a ligação" +msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1769,7 +1818,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1803,7 +1852,7 @@ msgstr "Não foi possível determinar o nome do socket" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "Impossível enviar o comando PORT" +msgstr "Não foi possível enviar o comando PORT" #: methods/ftp.cc:789 #, c-format @@ -1823,23 +1872,23 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problema fazendo o hash do ficheiro" +msgstr "Problema ao calcular o hash do ficheiro" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossível obter ficheiro, o servidor respondeu '%s'" +msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Socket de dados expirou" +msgstr "Expirou o tempo do socket de dados" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Transferência de dados falhou, o servidor respondeu '%s'" +msgstr "A transferência de dados falhou, o servidor respondeu '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1848,102 +1897,102 @@ msgstr "Pesquisa" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "Impossível invocar " +msgstr "Não foi possível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Ligando a %s (%s)" +msgstr "A Ligar a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a ligação para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Ligando a %s" +msgstr "A ligar a %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Falha temporária resolvendo '%s'" +msgstr "Falha temporária a resolver '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Impossível ligar a %s %s:" +msgstr "Não foi possível ligar a %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Não foi possível aceder à 'keyring': '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Não foi possível executar '%s' para verificar a assinatura (gnupg está " +"Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "As seguintes assinaturas estavam inválidas:\n" +msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1961,454 +2010,481 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Aguardando por cabeçalhos" +msgstr "A aguardar por cabeçalhos" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "O servidor http enviou um cabeçalho de resposta inválido" +msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" +msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" +msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Este servidor http possui suporte a range errado" +msgstr "Este servidor HTTP possui suporte de range errado" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" -msgstr "Select falhou." +msgstr "A selecção falhou" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" -msgstr "A ligação expirou" +msgstr "O tempo da ligação expirou" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Erro gravando para ficheiro de saída" +msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Erro gravando para ficheiro" +msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Erro gravando para o ficheiro" +msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "Erro lendo do servidor. O Remoto fechou a ligação" +msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "Erro lendo do servidor" +msgstr "Erro ao ler do servidor" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Falhou truncar o ficheiro" -#: methods/http.cc:1106 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Falhou a ligação" +msgstr "A ligação falhou" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossível fazer mmap de %lu bytes" +msgstr "Não foi possível fazer 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 "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "Selecção %s não encontrada" +msgstr "A selecção %s não foi encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "Abrindo ficheiro de configuração %s" +msgstr "A abrir o ficheiro de configuração %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linha %d é demasiado longa (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." +msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erro de sintaxe %s:%u: Tag Malformada" +msgstr "Erro de sintaxe %s:%u: Tag malformada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Erro de sintaxe %s:%u: Muitos includes encadeados" +msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro !" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Opção de linha de comandos '%c' [de %s] é desconnhecida." +msgstr "Opção '%c' da linha de comandos [de %s] é desconnhecida." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Opção de linha de comandos %s não é compreendida" +msgstr "Opção %s de linha de comandos não é compreendida" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Opção de linha de comandos %s não é booleana" +msgstr "Opção %s da linha de comandos não é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "Opção %s requer um argumento." +msgstr "A opção %s necessita de um argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Opção %s: Especificação de item de configuração deve possuir um =." +msgstr "Opção %s: Especificação de item de configuração tem de ter um =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Opção %s requer um argumento inteiro, não '%s'" +msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é demasiado longa" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Impossível mudar para %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Não utilizando locking para ficheiro lock apenas de leitura %s" +msgstr "" +"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Não usando locking para ficheiro de lock montado via nfs %s" +msgstr "" +"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " +"nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "Não foi possível obter lock %s" +msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Esperou, por %s mas não estava lá" +msgstr "Esperou por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-processo %s recebeu uma falha de segmentação." +msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Sub-processo %s retornou um código de erro (%u)" +msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Sub-processo %s finalizou inesperadamente" +msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "leitura, ainda restam %lu para serem lidos mas não resta nenhum" +msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "gravação, ainda restam %lu para gravar mas não foi possível" +msgstr "escrito, ainda restam %lu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Problema removendo o link ao ficheiro" +msgstr "Problema ao remover o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazia" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Este APT não suporta o Sistema de Versões '%s'" +msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Em Conflito" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Estraga" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" -msgstr "requerido" +msgstr "necessário" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Construindo Árvore de Dependências" +msgstr "A construir árvore de dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" -msgstr "Versões Candidatas" +msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" -msgstr "Geração de Dependência" +msgstr "Geração de dependências" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "A ler a informação de estado" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Falhou abrir o StateFile %s" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falha escrever ficheiro temporário StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Impossível o parse ao ficheiro de pacote %s (1)" +msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Impossível o parse ao ficheiro de pacote %s (2)" +msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" +msgstr "Linha malformada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "Abrindo %s" +msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:402 +#: 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 execução da instalação irá requerer remover temporariamente o pacote " -"essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto " +"Esta execução da instalação irá necessitar de remover temporariamente o " +"pacote essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto " "normalmente é mau, mas se você quer realmente fazer isso, active a opção " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " +"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2416,202 +2492,229 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." +msgstr "" +"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " +"estragados." + +#: 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 "" +"Falhou o download de alguns ficheiros de índice, foram ignorados ou os " +"antigos foram usados em seu lugar." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta directório de listas %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta o directório de repositório %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "A obter o ficheiro %li·of·%li" +msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:377 +#: 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 insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "" -"Não foi possível determinar um tipo de sistema de empacotamento aplicável" +"Não foi possível determinar um tipo de sistema de empacotamento adequado" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Impossível executar stat %s." +msgstr "Não foi possível fazer stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Pacote" +msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Não foi possível entender o tipo de marca %s" +msgstr "Não foi possível entender o tipo de marca (pin) %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Nenhuma prioridade (ou zero) especificada para marcação" +msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "A Cache possui um sistema de versões incompatível" +msgstr "A cache possui um sistema de versões incompatível" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Um erro ocorreu ao processar %s (NovoPacote)" +msgstr "Ocorreu um erro ao processar %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Um erro ocorreu ao processar %s (UsePacote1)" +msgstr "Ocorreu um erro ao processar %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Ocorreu um erro ao processar %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Um erro ocorreu ao processar %s (UsePacote2)" +msgstr "Ocorreu um erro ao processar %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" +msgstr "Ocorreu um erro ao processar %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" +msgstr "Ocorreu um erro ao processar %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Um erro ocorreu ao processar %s (UsePacote3)" +msgstr "Ocorreu um erro ao processar %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" +msgstr "Ocorreu um erro ao processar %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Ocorreu um erro ao processar %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de descrições que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Um erro ocorreu ao processar %s (FindPkg)" +msgstr "Ocorreu um erro ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" +msgstr "Ocorreu um erro ao processar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Obtendo File Provides" +msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5Sum incorreto" +msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Código de verificação hash não coincide" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " -"que você precisa consertar manualmente este pacote. (devido a arquitectura " -"não especificada)." +"Não foi possível localizar um ficheiro para o pacote %s. Isto pode " +"significar que você precisa corrigir manualmente este pacote. (devido a " +"arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2620,7 +2723,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2628,7 +2731,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2637,7 +2740,7 @@ msgstr "Tamanho incorrecto" msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2646,151 +2749,228 @@ msgstr "" "Utilizando o ponto de montagem do CD-ROM %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Label Guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "A utilizar o mount point do CD-ROM %s\n" +msgstr "A utilizar o ponto de montagem do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "A pesquisar os ficheiros de index do Disco..\n" +msgstr "A pesquisar os ficheiros de índice do disco..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu " +"índices de tradução e %zu assinaturas\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Encontrada a etiqueta '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "Isso não é um nome válido, tente de novo.\n" +msgstr "Isso não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Este Disco tem o nome: \n" +"Este disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "A desmontar o CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "A instalar %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "A configurar %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "A remover %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "A correr o 'trigger' de pós-instalação %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Falta o directório '%s'" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "A configurar %s" +msgid "Processing triggers for %s" +msgstr "A processar chamadas para %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "A preparar para remoção de %s" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "A remover %s" +msgstr "A preparar a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está " +"montado?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Não foi possível abrir ficheiro o %s" +msgstr "Não foi possível aplicar o 'patch' ao ficheiro" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Conexão encerrada prematuramente" +msgstr "Ligação encerrada prematuramente" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "'Dynamic MMap' ficou sem espaço" + +#~ 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 "" +#~ "Já que você requisitou uma única operação é extremamente provável que o \n" +#~ "pacote esteja simplesmente não instalável e deve ser enviado um\n" +#~ "relatório de bug contra esse pacote." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "a linha %d é demasiado longa (max %lu)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linha %d é demasiado longa (max %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Label Guardada: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Select falhou." #~ msgid "File date has changed %s" #~ msgstr "Data do ficheiro mudou %s" @@ -2819,9 +2999,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "Error occured while processing %s (UsePackage2)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#~ msgid "Error occured while processing %s (NewFileVer1)" -#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" - #~ msgid "Error occured while processing %s (NewVersion1)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" @@ -2856,54 +3033,41 @@ msgstr "Conexão encerrada prematuramente" #~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ." #~ "debs." -#, fuzzy #~ msgid "Extract " #~ msgstr "extra" -#, fuzzy #~ msgid "De-replaced " #~ msgstr "Substitui" -#, fuzzy #~ msgid "Replaced file " #~ msgstr "Substitui" -#, fuzzy #~ msgid "You must give at least one file name" #~ msgstr "Você deve passar exatamente um padrão" -#, fuzzy #~ msgid "Regex compilation error" #~ msgstr "Erro de compilação de regex - %s" -#, fuzzy #~ msgid "Failed to stat %s%s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to open %s.new" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" -#, fuzzy #~ msgid " files " #~ msgstr " falhou." -#, fuzzy #~ msgid "Done. " #~ msgstr "Pronto" -#, fuzzy #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossível achar pacote %s" -#, fuzzy #~ msgid "Failed too stat %s" #~ msgstr "Impossível checar %s." diff --git a/po/pt_BR.po b/po/pt_BR.po index da4f908..739df8f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,158 +2,169 @@ # Copyright (C) 2002 Free Software Foundation, Inc. # Gustavo Noronha Silva , 2002. # Andre Luis Lopes , 2002-2005. -# Felipe Augusto van de Wiel (faw) , 2006. +# Felipe Augusto van de Wiel (faw) , 2006-2008. msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-08-21 00:40-0300\n" -"Last-Translator: Felipe Augusto van de Wiel (faw) \n" -"Language-Team: l10n portuguese \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-17 02:33-0200\n" +"Last-Translator: Felipe Augusto van de Wiel (faw) \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Total de Nomes de Pacotes : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Total de Nomes de Pacotes: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pacotes puramente virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltando: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total de versões distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Total de descrições distintas: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total de relações ver/arquivo: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Total de relações Desc/Arquivo: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "Total de mapeamentos Provides: " +msgstr "Total de mapeamentos \"Provides\": " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Total de strings globbed: " +msgstr "Total de strings \"globbed\": " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total de espaço de dependência de versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total de espaço frouxo: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Total de espaço contabilizado: " +msgstr "Total de espaço contabilizado para: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "O arquivo de pacote %s está dessincronizado." +msgstr "O arquivo de pacote %s está fora de sincronia." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Você deve passar exatamente um padrão" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nenhum pacote encontrado" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Arquivos de pacote:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "O cache está fora de sincronia, não posso x-ref um arquivo de pacote" +msgstr "" +"O cache está fora de sincronia, não foi possível fazer a referência cruzada " +"de um arquivo de pacote" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Pacotes pinados:" +msgstr "Pacotes alfinetados (\"pinned\"):" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Pin do pacote: " +msgstr " Pacote alfinetado (\"pin\"): " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s para %s %s compilado em %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s para %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +187,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -196,47 +207,47 @@ msgstr "" " apt-cache [opções] showpkg pacote1 [pacote2 ...]\n" " apt-cache [opções] showsrc pacote1 [pacote2 ...]\n" "\n" -"O apt-cache é uma ferramenta de baixo nível usada para manipular\n" -"os arquivos de cache binários do APT e para buscar informações\n" -"neles\n" +"O apt-cache é uma ferramenta de baixo nível usada para manipular os\n" +"arquivos de cache binários do APT e para buscar informações neles\n" "\n" "Comandos:\n" " add - Adiciona um arquivo de pacote ao cache de fontes\n" " gencaches - Constrói ambos os caches de pacotes e fontes\n" -" showpkg - Mostra informações gerais sobre um pacote\n" +" showpkg - Mostra informações gerais para um único pacote\n" " showsrc - Mostra registros fontes\n" -" stats - Mostra estatísticas básicas\n" +" stats - Mostra algumas estatísticas básicas\n" " dump - Mostra o arquivo inteiro em uma forma concisa\n" " dumpavail - Imprime um arquivo \"available\" para stdout\n" -" unmet - Mostra dependências não satisfeitas (quebradas)\n" +" unmet - Mostra dependências desencontradas\n" " search - Procura a lista de pacotes por um padrão regex\n" " show - Mostra um registro legível sobre o pacote\n" -" depends - Mostra informações cruas de dependências de um pacote\n" +" depends - Mostra informações de dependências não processadas de um " +"pacote\n" " rdepends - Mostra informações de dependências reversas de um pacote\n" -" pkgnames - Lista o nome de todos os pacotes\n" -" dotty - Gera gráficos de pacotes para o GraphVis\n" +" pkgnames - Lista o nome de todos os pacotes no sistema\n" +" dotty - Gera gráficos de pacotes para o GraphViz\n" " xvcg - Gera gráficos de pacotes para o xvcg\n" " policy - Mostra as configurações de políticas\n" "\n" "Opções:\n" -" -h Esse texto de ajuda.\n" +" -h Este texto de ajuda.\n" " -p=? O cache de pacotes.\n" " -s=? O cache de fontes.\n" " -q Desabilita o indicador de progresso.\n" -" -i Mostra apenas dependências importantes para o comando unmet.\n" -" -c=? Ler arquivo de configuração especificado.\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -"Veja as páginas de manual apt-cache(8) e apt.conf(5) para maiores " -"informações.\n" +" -i Mostra somente dependências importantes para o comando \"unmet\".\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" +"Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -"Por favor, forneça um nome para este Disco, como 'Debian 2.1r1 Disco 1'" +"Por favor, forneça um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Por favor, insira um Disco no leitor e pressione enter" +msgstr "Por favor, insira um Disco na unidade e pressione enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -271,9 +282,10 @@ msgstr "" " dump - Mostra a configuração\n" "\n" "Opções:\n" -" -h Esse texto de ajuda.\n" -" -c=? Ler esse arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -h Este texto de ajuda.\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -295,16 +307,17 @@ msgid "" msgstr "" "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" "\n" -"O apt-extracttemplates é uma ferramenta para extrair configuração\n" -"e informação de modelo (\"template\") de pacotes debian.\n" +"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n" +"(\"template\") e configuração de pacotes debian.\n" "\n" "Opções:\n" -" -h Esse texto de ajuda\n" +" -h Este texto de ajuda\n" " -t Define o diretório temporário\n" -" -c=? Ler esse arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -313,31 +326,31 @@ msgstr "Impossível escrever para %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é muito extensa" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Erro processando o diretório %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é muito extensa" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erro processando conteúdo %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -386,337 +399,338 @@ msgstr "" " generate config [grupos]\n" " clean config\n" "\n" -"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele \n" -"suporta muitos estilos de geração, desde totalmente automatizadas até \n" -"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" +"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n" +"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n" +"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n" "\n" -"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs. \n" -"O arquivo Package contém o conteúdo de todos os campos control de \n" -"cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" -"override é suportado para forçar o valor de Priority e Section.\n" +"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n" +"O arquivo Package contém o conteúdo de todos os campos controle de\n" +"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n" +"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n" +"a seção (\"Section\").\n" "\n" -"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma \n" -"árvore de .dscs. A opção --source-override pode ser usada para \n" -"especificar um arquivo override de fontes\n" +"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n" +"árvore de .dscs. A opção --source-override pode ser usada para\n" +"especificar um arquivo override de fontes.\n" "\n" -"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" -"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" -"e o arquivo override deve conter as flags override. CaminhoPrefixo é \n" -"incluído aos campos filename caso esteja presente. Exemplo de uso do \n" -"repositório Debian:\n" +"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n" +"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n" +"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n" +"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n" +"uso do repositório Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Opções:\n" -" -h Este texto de ajuda\n" -" --md5 Controla a geração de MD5\n" -" -s=? Arquivo fonte (source) override\n" -" -q Quieto\n" -" -d=? Seleciona a base de dados de caching opcional\n" -" --no-delink Habilita o modo de depuração delinking\n" -" --contents Controla a geração do arquivo de conteúdo\n" -" -c=? Lê este arquivo de configuração\n" -" -o=? Define uma opção de configuração arbitrária" - -#: ftparchive/apt-ftparchive.cc:762 +" -h Este texto de ajuda\n" +" --md5 Controla a geração de MD5\n" +" -s=? Arquivo fonte (\"source\") override\n" +" -q Quieto\n" +" -d=? Seleciona o banco de dados de caching opcional\n" +" --no-delink Habilita o modo de depuração \"delinking\"\n" +" --contents Controla a geração do arquivo de conteúdo\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária" + +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Nenhuma seleção correspondente" +msgstr "Nenhuma seleção combinou" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'" +msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD estava corrompido, arquivo renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " -"apt, por favor remova e recrie o banco de dados." +"apt, por favor, remova e recrie o banco de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Impossível abrir arquivo BD %s: %s" +msgstr "Impossível abrir o arquivo BD %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Falha ao checar %s" +msgstr "Falhou ao executar \"stat\" %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossível ler o diretório %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Impossível checar %s\n" +msgstr "W: Impossível executar \"stat\" em %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E: Erros aplicam ao arquivo " +msgstr "E: Erros que se aplicam ao arquivo " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Falha ao resolver %s" +msgstr "Falhou ao resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Falha ao percorrer a árvore" +msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Falha ao abrir %s" +msgstr "Falhou ao abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Falha ao executar readlink %s" +msgstr "Falhou ao executar \"readlink\" %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Falha ao executar unlink %s" +msgstr "Falhou ao executar \"unlink\" %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Falha ao ligar %s a %s" +msgstr "*** Falhou ao ligar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s não possui entrada source override\n" +msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s também não possui entrada binary override\n" +msgstr " %s também não possui entrada override binária\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Erro interno, não foi possível localizar membro %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Falha ao ler o arquivo override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compactação desconhecido '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compactação" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Falha ao criar pipe IPC para subprocesso" +msgstr "Falhou ao criar pipe IPC para sub-processo" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Falha ao criar FILE*" +msgstr "Falhou ao criar FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Falha oa executar fork" +msgstr "Falhou ao executar \"fork\"" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Erro interno, falha ao criar %s" +msgstr "Erro interno, falhou ao criar %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Falha ao criar subprocesso IPC" +msgstr "Falhou ao criar sub-processo IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Falha ao executar compressor " +msgstr "Falhou ao executar compactador " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "descompactador" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IO para subprocesso/arquivo falhou" +msgstr "E/S para sub-processo/arquivo falhou" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Falha ao ler durante o cálculo MD5" +msgstr "Falhou ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Problema executando unlinking %s" +msgstr "Problema removendo %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Falha ao renomear %s para %s" +msgstr "Falhou ao renomear %s para %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "mas não está instalável" +msgstr "mas não é instalável" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "mas não vai ser instalado" +msgstr "mas não será instalado" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -725,176 +739,178 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "%lu desatualizados, " +msgstr "%lu revertidos, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Pronto" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." +msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Aviso de autenticação sobrescrito.\n" +msgstr "Aviso de autenticação sobreposto.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Impossível criar lock no diretório de download" +msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "A lista de fontes não pôde ser lida." +msgstr "A lista de fontes não pode ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Que estranho.. Os tamanhos não batem, informe apt@packages.debian.org" +msgstr "" +"Que estranho.. Os tamanhos não batem, mande e-mail para apt@packages.debian." +"org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" +msgstr "É preciso baixar %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "É preciso fazer o download de %sB de arquivos.\n" +msgstr "É preciso baixar %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"Depois de desempacotar, %sB adicionais de espaço em disco serão usados.\n" +"Depois desta operação, %sB adicionais de espaço em disco serão usados.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Trivial Only especificado mas essa não é uma operação trivial." +msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" -#: cmdline/apt-get.cc:868 +#: 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 "" -"Você está prestes a fazer algo potencialmente destruidor.\n" +"Você está prestes a fazer algo potencialmente destrutivo.\n" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "Quer continuar [S/n]? " +msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Falha ao buscar %s %s\n" +msgstr "Falhou ao buscar %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,48 +918,47 @@ msgstr "" "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar " "com --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "Impossível corrigir pacotes faltosos." +msgstr "Impossível corrigir pacotes faltantes." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Abortando instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "" -"Ignorando %s, já está instalado e a atualização não está configurada.\n" +msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "O pacote %s é um pacote virtual provido por:\n" +msgstr "O pacote %s é um pacote virtual fornecido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Você deve selecionar um explicitamente para instalar." +msgstr "Você deveria selecionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -951,265 +966,295 @@ msgid "" "is only available from another source\n" msgstr "" "O pacote %s não está disponível, mas é referenciado por outro pacote.\n" -"Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" +"Isto pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Impossível criar lock no diretório de listas" +msgstr "Impossível criar trava no diretório de listas" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " -"antigos foram usados no lugar." +"Os seguintes pacotes foram automaticamente instalados e não são mais " +"requeridos:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Use 'apt-get autoremove' para removê-los." + +#: 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, parece que o AutoRemover destruiu algo o que realmente não deveria\n" +"acontecer. Por favor, reporte um bug contra o 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 "A informação a seguir pode ajudar a resolver a situação:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro Interno, o AutoRemover quebrou coisas" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Erro interno, AllUpgrade quebrou as coisas" +msgstr "Erro interno, AllUpgrade quebrou coisas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Impossível achar tarefa %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s configurado para instalar manualmente.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:" +msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " +"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Alguns pacotes não puderam ser instalados. Isso pode significar que\n" -"você solicitou uma situação impossível ou se você está usando a\n" +"Alguns pacotes não puderam ser instalados. Isto pode significar que\n" +"você solicitou uma situação impossível ou, se você está usando a\n" "distribuição instável, que alguns pacotes requeridos não foram\n" -"criados ainda ou foram tirados do Incoming." - -#: cmdline/apt-get.cc:1569 -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 "" -"Já que você solicitou uma única operação é bem provável que o pacote\n" -"esteja simplesmente não instalável e um relato de erro sobre esse\n" -"pacotes deve ser enviado." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A informação a seguir pode ajudar a resolver a situação:" +"criados ainda ou foram retirados da \"Incoming\"." -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Ignorando arquivo já obtido '%s'\n" +msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Precisa obter %sB de arquivos fonte.\n" +msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Falha ao buscar alguns arquivos." +msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" +msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " -"pôde ser encontrado" +"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " +"pode ser encontrado" -#: cmdline/apt-get.cc:2282 +#: 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 "" -"a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão " -"disponível do pacote %s pôde satisfazer os requerimentos de versão" +"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " +"disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " +"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falha ao satisfazer dependência de %s por %s: %s" +msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Falha ao processar as dependências de construção" +msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" -msgstr "Módulos suportados:" +msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1269,8 @@ msgid "" " 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" @@ -1239,7 +1286,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1254,40 +1301,43 @@ msgstr "" " apt-get [opções] install|remove pacote1 [pacote2 ...]\n" " apt-get [opções] source pacote1 [pacote2 ...]\n" "\n" -"O apt-get é uma interface simples de linha de comando para fazer o\n" -"download de pacotes e instalá-los. Os comandos usados mais frequentemente\n" -"são update e install.\n" +"O apt-get é uma interface simples de linha de comando para baixar\n" +"pacotes e instalá-los. Os comandos usados mais frequentemente são\n" +"update e install.\n" "\n" "Comandos:\n" -" update - Adquire novas listas de pacotes\n" -" upgrade - Faz uma atualização\n" +" update - Obtém novas listas de pacotes\n" +" upgrade - Realiza uma atualização\n" " install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n" " remove - Remove pacotes\n" +" autoremove - Remove automaticamente todos os pacotes não usados\n" +" purge - Remove e expurga (\"purge\") pacotes\n" " source - Baixa arquivos fonte\n" " build-dep - Configura as dependências de compilação de pacotes fonte\n" -" dist-upgrade - Atualiza a distribuição, consulte apt-get(8)\n" +" dist-upgrade - Atualiza a distribuição, veja apt-get(8)\n" " dselect-upgrade - Segue as seleções do dselect\n" " clean - Apaga arquivos baixados para instalação\n" " autoclean - Apaga arquivos antigos baixados para instalação\n" " check - Verifica se não há dependências quebradas\n" "\n" "Opções:\n" -" -h Esse texto de ajuda\n" -" -q Saída logável, exceto para erros\n" +" -h Este texto de ajuda\n" +" -q Saída que pode ser registrada em log - sem indicador de progresso\n" " -qq Sem saída, exceto para erros\n" -" -d Fazer o download apenas - NÃO instalar ou desempacotar arquivos\n" -" -s Não-agir. Executar simulação de ordenação\n" -" -y Assumir Sim para todas as perguntas e não questionar\n" -" -f Tenta continuar se a checagem de integridade falhar\n" +" -d Apenas baixa - NÃO instala ou desempacota arquivos\n" +" -s Não-age. Executa simulação de ordenação\n" +" -y Assume Sim para todas as perguntas e não questiona\n" +" -f Tenta corrigir um sistema com dependências quebradas\n" " -m Tenta continuar se os arquivos não podem ser localizados\n" " -u Mostra uma lista de pacotes atualizados também\n" " -b Constrói o pacote fonte depois de baixá-lo\n" " -V Exibe números de versões mais detalhados\n" -" -c=? Ler esse arquivo de configuração\n" -" -o=? Definir uma opção de configuração arbitrária, ex -o dir::cache=/tmp\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" "Veja as páginas de manual apt-get(8), sources.list(5) e apt.conf(5)\n" -"para maiores informações e opções.\n" -" Este APT tem Poderes de Super Vaca.\n" +"para mais informações e opções.\n" +" Este APT tem Poderes de Super Vaca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1295,7 +1345,7 @@ msgstr "Atingido " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Obtendo:" +msgstr "Obter:" #: cmdline/acqprogress.cc:110 msgid "Ign " @@ -1322,9 +1372,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Troca de mídia: por favor insira o disco nomeado\n" +"Troca de mídia: por favor, insira o disco nomeado\n" " '%s'\n" -"no drive '%s' e pressione enter\n" +"na unidade '%s' e pressione enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1349,40 +1399,44 @@ msgstr "" "A opção -s é usada para indicar que tipo de arquivo é.\n" "\n" "Opções:\n" -" -h Esse texto de ajuda\n" +" -h Este texto de ajuda\n" " -s Usar ordenação de arquivo fonte\n" -" -c=? Ler esse arquivo de configuração\n" -" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" #: dselect/install:32 msgid "Bad default setting!" msgstr "Configuração padrão ruim!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pressione enter para continuar." +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Você quer apagar quaisquer arquivos .deb previamente baixados?" + # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" -"Alguns erros ocorreram ao desempacotar. Eu vou configurar os pacotes que " -"foram" +"Alguns erros ocorreram ao desempacotar. Vou configurar os pacotes que foram" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" "instalados. Isto pode resultar em erros duplicados ou erros causados por" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "dependências faltantes. Isto está OK, somente os erros acima desta mensagem" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" @@ -1391,312 +1445,311 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" msgid "Merging available information" msgstr "Mesclando informação disponível" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Falha ao criar pipes" +msgstr "Falhou ao criar \"pipes\"" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Falha ao executar gzip " +msgstr "Falhou ao executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arquivo é muito pequeno" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Falha ao ler os cabeçalhos do arquivo" +msgstr "Falhou ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode chamado em nodo ainda ligado (linked)" +msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Falha ao localizar o elemento hash!" +msgstr "Falhou ao localizar o elemento hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Falha ao alocar desvio (diversion)" +msgstr "Falhou ao alocar desvio (\"diversion\")" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "Erro interno em AddDiversion" +msgstr "Erro interno em \"AddDiversion\"" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" +msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Falha ao gravar arquivo %s" +msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Falha ao fechar arquivo %s" +msgstr "Falhou ao fechar arquivo %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é muito longo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Desempacotando %s mais de uma vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "O diretório %s é desviado (diverted)" +msgstr "O diretório %s é desviado (\"diverted\")" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O pacote está tentando gravar no alvo de desvio %s/%s" +msgstr "O pacote está tentando escrever no alvo do desvio %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O diretório %s está sendo substituído por um não-diretório" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Falha ao localizar nodo em seu hash bucket" +msgstr "Falha ao localizar nó em seu \"hash bucket\"" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "O caminho é muito longo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Sobreescrita de pacote não casa com nenhuma versão para %s" +msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" +msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Impossível ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Impossível checar %s" +msgstr "Impossível executar \"stat\" em %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Falha ao remover %s" +msgstr "Falhou ao remover %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossível criar %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Falha ao checar %sinfo." +msgstr "Falhou ao executar \"stat\" em %sinfo." -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Lendo lista de pacotes" +msgstr "Lendo listas de pacotes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falha ao mudar para o diretório administrativo %sinfo" +msgstr "Falhou ao mudar para o diretório administrativo %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Erro interno obtendo um nome de pacote" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Lendo listagem de pacotes" +msgstr "Lendo listagem de arquivos" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Falha ao abrir o arquivo de lista '%sinfo/%s'. Caso você não consiga " -"restaurar esse arquivo, crie um outro arquivo vazio e reinstale a mesma " +"Falhou ao abrir o arquivo de lista '%sinfo/%s'. Se você não conseguir " +"restaurar este arquivo, crie-o vazio e imediatamente reinstale a mesma " "versão do pacote!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falha ao ler o arquivo de lista %sinfo/%s" +msgstr "Falhou ao ler o arquivo de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Erro interno obtendo um nodo" +msgstr "Erro interno obtendo um nó" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falha ao abrir o arquivo de desvios %sdiversions" +msgstr "Falhou ao abrir o arquivo de desvios %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O arquivo de desvios está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Linha inválida no arquivo de desvio: %s" +msgstr "Linha inválida no arquivo de desvios: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erro interno ao adicionar um desvio" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falha ao encontrar um Pacote: cabeçalho, posição %lu" +msgstr "Falhou ao encontrar um Pacote: cabeçalho, posição %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Seção ConfFile ruim no arquivo de estado. Posição %lu" +msgstr "Seção \"ConfFile\" ruim no arquivo de estado. Posição %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Erro interpretando MD5. Posição %lu" +msgstr "Erro analisando MD5. Posição %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Este não é um arquivo DEB válido, membro '%s' faltando" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Este não é um arquivo DEB válido, o mesmo não possui um membro '%s' ou '%s'" +"Este não é um arquivo DEB válido, não possui um membro '%s', '%s' ou '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Não foi possível mudar para %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Erro interno, não foi possível localizar membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Falha em localizar um arquivo de controle válido" +msgstr "Falhou ao localizar um arquivo de controle válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Arquivo de controle não interpretável" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossível ler a base de dados de cdrom %s" +msgstr "Impossível ler o banco de dados de cdrom %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 "" -"Por favor use o apt-cdrom para fazer com que este CD-ROM seja reconhecido " -"pelo APT. apt-get update não pode ser usado para adicionar novos CD-ROMs" +"Por favor, use o apt-cdrom para fazer com que este CD-ROM seja reconhecido " +"pelo APT. O apt-get update não pode ser usado para adicionar novos CD-ROMs" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD-ROM errado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Falha ao checar" +msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Falha ao definir hora de modificação" +msgstr "Falhou ao definir hora de modificação" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1705,7 +1758,7 @@ msgstr "URI inválida, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Logando" +msgstr "Efetuando login" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" @@ -1718,17 +1771,17 @@ msgstr "Impossível determinar o nome local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Servidor recusou a conexão e respondeu: %s" +msgstr "O servidor recusou a conexão e disse: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER falhou, servidor respondeu: %s" +msgstr "USER falhou, servidor disse: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS falhou, servidor respondeu: %s" +msgstr "PASS falhou, servidor disse: %s" #: methods/ftp.cc:237 msgid "" @@ -1741,12 +1794,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Comando de script de login '%s' falhou, servidor respondeu: %s" +msgstr "Comando de script de login '%s' falhou, servidor disse: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE falhou, servidor respondeu: %s" +msgstr "TYPE falhou, servidor disse: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1756,7 +1809,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1768,9 +1821,9 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "Erro de gravação" +msgstr "Erro de escrita" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1778,11 +1831,11 @@ msgstr "Não foi possível criar um socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Não foi possível conectar socket de dados, conexão expirou" +msgstr "Não foi possível conectar um socket de dados, conexão expirou" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Não foi possível conectar socket passivo." +msgstr "Não foi possível conectar um socket passivo." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" @@ -1790,7 +1843,7 @@ msgstr "getaddrinfo não foi capaz de obter um socket de escuta" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Não foi possível fazer o bind de um socket" +msgstr "Não foi possível fazer \"bind\" de um socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" @@ -1812,7 +1865,7 @@ msgstr "Família de endereços %u desconhecida (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT falhou, servidor respondeu: %s" +msgstr "EPRT falhou, servidor disse: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@ -1822,14 +1875,14 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problema fazendo o hash do arquivo" +msgstr "Problema criando o hash do arquivo" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossível obter arquivo, servidor respondeu '%s'" +msgstr "Impossível obter arquivo, servidor disse '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1838,7 +1891,7 @@ msgstr "Socket de dados expirou" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Transferência de dados falhou, servidor respondeu '%s'" +msgstr "Transferência de dados falhou, servidor disse '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1849,59 +1902,59 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando em %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Não posso iniciar a conexão para %s:%s (%s)." +msgstr "Não foi possível iniciar a conexão para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Impossível conectar em %s %s:" @@ -1911,496 +1964,521 @@ msgstr "Impossível conectar em %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Não foi possível acessar o chaveiro: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Não foi possível executar '%s' para verificar a assinatura (o gnupg está " +"Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"As assinaturas a seguir não puderam ser verificadas devido a chave pública " +"As assinaturas a seguir não puderam ser verificadas devido à chave pública " "não estar disponível:\n" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Não foi possível abrir pipe para %s" +msgstr "Não foi possível abrir \"pipe\" para %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" +msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" +msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Este servidor HTTP possui suporte a range quebrado" +msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Erro gravando para arquivo de saída" +msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Erro gravando para arquivo" +msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Erro gravando para o arquivo" +msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Falhou ao truncar arquivo" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Não foi possível fazer mmap de arquivo vazio" +msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossível fazer mmap de %lu bytes" +msgstr "Não foi possível fazer \"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 "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Seleção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linha %d muito longa (máx. %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Erro de sintaxe %s:%u: Muitos includes aninhados" +msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada" +msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Opção de linha de comando '%c' [de %s] é desconnhecida." +msgstr "Opção de linha de comando '%c' [de %s] é desconhecida." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Opção de linha de comando %s não é compreendida" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opção de linha de comando %s não é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opção %s requer um argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opção %s: Especificação de item de configuração deve possuir um =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opção %s requer um argumento inteiro, não '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é muito longa" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Impossível checar o ponto de montagem %s" +msgstr "Impossível executar \"stat\" no ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Impossível mudar para %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Impossível checar o cdrom" +msgstr "Impossível executar \"stat\" no cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Não usando locking para arquivo de trava somente leitura %s" +msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Não usando locking para arquivo de trava montado via nfs %s" +msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "gravação, ainda restam %lu para gravar mas não foi possível" +msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Problema removendo o link do arquivo" +msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazio" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O arquivo de cache de pacotes é uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflita" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Quebra" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Construindo árvore de dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Geração de dependência" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Lendo informação de estado" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:402 +#: 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 execução de instalação irá requerer remover temporariamente o pacote " +"Esta execução de instalação requererá a remoção temporária do pacote " "essencial %s devido a um loop de Conflitos/Pré-Dependências. Isso geralmente " "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2408,7 +2486,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2416,190 +2494,214 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " +"antigos foram usados no lugar." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Diretório de repositório %spartial está faltando." +msgstr "Diretório de arquivos %spartial está faltando." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Obtendo o arquivo %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Obtendo arquivo %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "O driver do método %s não pôde ser encontrado." +msgstr "O driver do método %s não pode ser encontrado." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:377 +#: 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, insira o disco nomeado: '%s' no leitor '%s' e pressione enter." +"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "" -"Não foi possível determinar um tipo de sistema de empacotamento aplicável." +msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável." -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Impossível checar %s." +msgstr "Impossível executar \"stat\" %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"As listas de pacotes ou os arquivos de status não puderam ser analisados ou " +"As listas de pacotes ou os arquivos de estado não puderam ser analisados ou " "abertos." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Você terá que executar apt-get update para corrigir esses problemas" +msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Não foi possível entender o tipo de pin %s" +msgstr "Não foi possível entender o tipo de \"pin\" %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Nenhuma prioridade (ou zero) especificada para pin" +msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "O cache possui um sistema de versões incompatível" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Um erro ocorreu processando %s (NovoArquivoDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Um erro ocorreu processando %s (NovoArquivoDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de descrições que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (EncontrarPacote)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Não foi possível checar a lista de pacotes fonte %s" +msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Coletando Arquivo Provides" +msgstr "Coletando Arquivo \"Provides\"" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "Erro de I/O ao gravar cache fonte" +msgstr "Erro de E/S ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash Sum incorreto" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2609,7 +2711,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2618,24 +2720,24 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " -"para o pacote %s." +"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" +"\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Tamanho incorreto" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Bloco Fornecedor %s não contém impressão digital (\"fingerprint\"" +msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2644,49 +2746,60 @@ msgstr "" "Usando ponto de montagem de CD-ROM %s\n" "Montando CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Procurando por arquivos de índice no disco..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i " -"assinaturas\n" +"Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " +"índice(s) de traduções e %zu assinatura(s)\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Rótulo encontrado: '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2695,94 +2808,115 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Desmontando CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: 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 "Removendo %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Executando gatilho pós-instalação %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Diretório '%s' está faltando" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Processing triggers for %s" +msgstr "Erro processando gatilhos para %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Removendo %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Não foi possível aplicar o patch" @@ -2791,8 +2925,49 @@ msgstr "Não foi possível aplicar o patch" msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" -#~ msgid "Total package names: " -#~ msgstr "Total de nomes de pacotes: " +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "\"MMap\" Dinâmico ficou sem espaço" + +#~ 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 "" +#~ "Já que você solicitou uma única operação é bem provável que o pacote\n" +#~ "esteja simplesmente não instalável e um relatório de bug sobre esse\n" +#~ "pacote deveria ser enviado." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linha %d muito longa (máx. %d)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linha %d muito longa (máx. %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Rótulo armazenado: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i " +#~ "assinaturas\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Seleção falhou" #~ msgid "File date has changed %s" #~ msgstr "Data do arquivo mudou %s" @@ -2828,54 +3003,41 @@ msgstr "Conexão encerrada prematuramente" #~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ." #~ "debs." -#, fuzzy #~ msgid "Extract " #~ msgstr "extra" -#, fuzzy #~ msgid "De-replaced " #~ msgstr "Substitui" -#, fuzzy #~ msgid "Replaced file " #~ msgstr "Substitui" -#, fuzzy #~ msgid "You must give at least one file name" #~ msgstr "Você deve passar exatamente um padrão" -#, fuzzy #~ msgid "Regex compilation error" #~ msgstr "Erro de compilação de regex - %s" -#, fuzzy #~ msgid "Failed to stat %s%s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to open %s.new" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" -#, fuzzy #~ msgid " files " #~ msgstr " falhou." -#, fuzzy #~ msgid "Done. " #~ msgstr "Pronto" -#, fuzzy #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossível achar pacote %s" -#, fuzzy #~ msgid "Failed too stat %s" #~ msgstr "Impossível checar %s." diff --git a/po/ro.po b/po/ro.po index e3d5d1e..81c29e4 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,160 +1,171 @@ -# translation of apt_po_ro.po to Romanian +# translation of ro.po to Romanian # This file is put in the public domain. # # Sorin Batariuc , 2004, 2005, 2006. +# Eddy Petrișor , 2008. msgid "" msgstr "" -"Project-Id-Version: apt_po_ro\n" +"Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-19 01:35+0300\n" -"Last-Translator: Sorin Batariuc \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-15 02:21+0200\n" +"Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Pachetul %s versiunea %s are o dependenţă neîndeplinită:\n" +msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Nu pot localiza pachetul %s" +msgstr "Nu s-a putut localiza pachetul %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Total nume pachete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pachete normale: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pachete virtuale pure: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pachete virtuale singulare: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pachete virtuale mixte: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Lipsă: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total versiuni distincte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Numărul total de descrieri distincte: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "Total dependenÅ£e: " +msgstr "Total dependențe: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "Total relaÅ£ii versiune/fişier: " +msgstr "Total relații versiune/fișier: " + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Total relații desc/fișier: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total cartări Furnizează: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Total şiruri înglobate: " +msgstr "Total șiruri înglobate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Total spaÅ£iu versiuni ale dependenÅ£elor: " +msgstr "Total spațiu versiuni ale dependențelor: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Total spaÅ£iu intern: " +msgstr "Total spațiu intern: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Total spaÅ£iu contorizat pentru: " +msgstr "Total spațiu contorizat pentru: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "Fişierul pachetului %s este desincronizat." +msgstr "Fișierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Trebuie să daÅ£i exact un şablon" +msgstr "Trebuie să dați exact un șablon" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "Fişiere pachet: " +msgstr "Fișiere pachet: " -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache este desincronizat, nu pot executa x-ref un fişier pachet" +msgstr "" +"Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(negăsit)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(niciunul)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s pentru %s %s compilat pe %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s pentru %s compilat la %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -192,54 +203,53 @@ 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 "" -"Utilizare: apt-cache [opÅ£iuni] comanda\n" -" apt-cache [opÅ£iuni] add fişier1 [fişier2 ...]\n" -" apt-cache [opÅ£iuni] showpkg pachet1 [pachet2 ...]\n" -" apt-cache [opÅ£iuni] showsrc pachet1 [pachet2 ...]\n" +"Utilizare: apt-cache [opțiuni] comanda\n" +" apt-cache [opțiuni] add fișier1 [fișier2 ...]\n" +" apt-cache [opțiuni] showpkg pachet1 [pachet2 ...]\n" +" apt-cache [opțiuni] showsrc pachet1 [pachet2 ...]\n" "\n" -"apt-cache este o unealtă de nivel scăzut pentru manipularea fişierelor\n" -"binare din cache-ul APT, şi de interogare a informaÅ£iilor din ele\n" +"apt-cache este o unealtă de nivel scăzut pentru manipularea fișierelor\n" +"binare din cache-ul APT, și de interogare a informațiilor din ele\n" "\n" "Comenzi:\n" -" add - Adaugă un fişier pachet la cache-ul sursă\n" -" gencaches - Construieşte şi cache-ul pachet şi cache-ul sursă\n" -" showpkg - Arată unele informaÅ£ii generale pentru un singur pachet\n" -" showsrc - Arată înregistrările sursei\n" -" stats - Arată unele statistici de bază\n" -" dump - Arată întregul fişier într-o formă concisă\n" -" dumpavail - Afişează un fişier disponibil către stdout\n" -" unmet - Arată dependenÅ£ele neîndeplinite\n" -" search - Caută în lista de pachete pentru un şablon regex\n" -" show - Arată o înregistrare lizibilă pentru pachet\n" -" depends - Arată informaÅ£ii brute de dependenţă pentru un pachet\n" -" rdepends - Arată dependenÅ£ele inversate pentru un pachet\n" -" pkgnames - Afişează numele tuturor pachetelor\n" -" dotty - Generează grafice de pachete pentru GraphVis\n" -" xvcg - Generează grafice de pachete pentru xvcg\n" -" policy - Arată ajustările de politică\n" +" add - Adaugă un fișier pachet la cache-ul sursă\n" +" gencaches - Generează cache-ul de pachete și cache-ul de surse\n" +" showpkg - Arată câteva informații generale pentru un pachet\n" +" showsrc - Arată înregistrările despre sursă\n" +" stats - Arată câteva statistici de bază\n" +" dump - Arată întregul fișier într-o formă concisă\n" +" dumpavail - Afișează un fișier disponibil la ieșirea standard\n" +" unmet - Arată dependențele neîndeplinite\n" +" search - Caută în lista de pachete folosind un șablon regex\n" +" show - Arată o înregistrare lizibilă pentru pachet\n" +" depends - Arată informații brute de dependențe pentru un pachet\n" +" rdepends - Arată dependențele inverse pentru un pachet\n" +" pkgnames - Afișează numele tuturor pachetelor din sistem\n" +" dotty - Generează grafice cu pachete pentru GraphViz\n" +" xvcg - Generează grafice cu pachete pentru xvcg\n" +" policy - Arată configurațiile de politici\n" "\n" -"OpÅ£iuni:\n" +"Opțiuni:\n" " -h Acest text de ajutor.\n" " -p=? Cache-ul de pachete.\n" " -s=? Cache-ul de surse.\n" " -q Dezactivează indicatorul de progres.\n" -" -i Arată doar dependenÅ£ele importante pentru comanda neîndeplinită.\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -"VedeÅ£i manualele apt-cache(8) şi apt.conf(5) pentru mai multe informaÅ£ii.\n" +" -i Arată doar dependențele importante pentru comanda „unmet”.\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" +"Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" -"Vă rog furnizaÅ£i un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'" +msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Vă rog introduceÅ£i un disc în unitate şi apăsaÅ£i Enter" +msgstr "Introduceți un disc în unitate și apăsați Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "RepetaÅ£i această procedură pentru restul CD-urilor." +msgstr "Repetați această procedură pentru restul CD-urilor din set." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -260,19 +270,19 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizare: apt-config [opÅ£iuni] comanda\n" +"Utilizare: apt-config [opțiuni] comanda\n" "\n" -"apt-config este o unealtă simplă pentru citirea fişierului de configurare " +"apt-config este o unealtă simplă pentru citirea fișierului de configurare " "APT\n" "\n" "Comenzi:\n" " shell - Modul consolă\n" -" dump - Arată configurarea\n" +" dump - Arată configurația\n" "\n" -"OpÅ£iuni:\n" +"Opțiuni:\n" " -h Acest text de ajutor.\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -292,51 +302,51 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizare: apt-extracttemplates fişier1 [fişier2 ...]\n" +"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" "\n" -"apt-extracttemplates este o unealtă pentru extragerea informaÅ£iilor \n" -"de configurare şi şabloane dintr-un pachet Debian\n" +"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" +"de configurare și a șabloanelor dintr-un pachet Debian\n" "\n" -"OpÅ£iuni\n" +"Opțiuni\n" " -h Acest text de ajutor.\n" -" -t Impune directorul temp\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" +" -t Impune directorul temporar\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" -msgstr "Nu pot scrie în %s" +msgstr "Nu s-a putut scrie în %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nu pot citi versiunea debconf. Este instalat debconf?" +msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista de extensii pentru pachet este prea lungă" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Eroare la prelucrarea directorului %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista de extensii pentru sursă este prea lungă" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Eroare la scrierea antetului în fişierul index" +msgstr "Eroare la scrierea antetului în fișierul index" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Eroare la prelucrarea conÅ£inutului %s" +msgstr "Eroare la prelucrarea conținutului %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -377,846 +387,876 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Utilizare: apt-ftparchive [opÅ£iuni] comanda\n" -"Comenzi: packages cale_binare [fişier_înlocuire [prefix_cale]]\n" -" sources cale_src [fişier_înlocuire [prefix_cale]]\n" +"Utilizare: apt-ftparchive [opțiuni] comanda\n" +"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n" +" sources cale_src [fișier_înlocuire [prefix_cale]]\n" " contents cale\n" " release cale\n" " generate config [grupuri]\n" " clean config\n" "\n" -"apt-ftparchive generează fişiere de indexare pentru arhivele Debian. " +"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. " "Suportă\n" -"multe stiluri de generare de la complet automat la înlocuiri funcÅ£ionale\n" -"pentru dpkg-scanpackage şi dpkg-scansources\n" +"multe stiluri de generare de la complet automat la înlocuiri funcționale\n" +"pentru dpkg-scanpackage și dpkg-scansources\n" "\n" -"apt-ftparchive generează fişierele Package dintr-un arbore de .deb-uri.\n" -"Fişierul Pachet înglobează conÅ£inutul tuturor câmpurilor de control din " +"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n" +"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din " "fiecare\n" -"pachet cât şi MD5 hash şi dimensiunea fişierului. Un fişier de înlocuire " +"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire " "este\n" -"furnizat pentru a forÅ£a valoarea Priorităţii şi SecÅ£iunii.\n" +"furnizat pentru a forța valoarea Priorității și Secțiunii.\n" "\n" -"În mod asemănator apt-ftparchive generează fişierele Sources dintr-un arbore " +"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore " "de .dsc-uri.\n" -"OpÅ£iunea --source-override poate fi folosită pentru a specifica fişierul de " +"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de " "înlocuire\n" "\n" -"Comenzile 'packages' şi 'sources' ar trebui executate în rădăcina " +"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina " "arborelui.\n" -"Cale_binare ar trebui să indice baza căutării recursive şi fişierul de " +"Cale_binare ar trebui să indice baza căutării recursive și fișierul de " "înlocuire ar\n" -"trebui să conÅ£ină semnalizatorul de înlocuire. Prefix_cale este adăugat " +"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat " "câmpului\n" -"de nume fişier dacă acesta este prezent. Exemplu de utilizare din arhiva\n" +"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n" "Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"OpÅ£iuni:\n" +"Opțiuni:\n" " -h Acest text de ajutor.\n" " --md5 Generarea controlului MD5\n" -" -s=? Fişierul de înlocuire pentru surse\n" -" -q În linişte\n" -" -d=? Selectează baza de date de cache opÅ£ională\n" +" -s=? Fișierul de înlocuire pentru surse\n" +" -q În liniște\n" +" -d=? Selectează baza de date de cache opțională\n" " --no-delink Activează modul de depanare dezlegare\n" -" --contents Generarea fişierului cu sumarul de control\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară" +" --contents Generarea fișierului cu sumarul de control\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Nu s-a potrivit nici o selecÅ£ie" +msgstr "Nu s-a potrivit nici o selecție" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Unele fişiere lipsesc din grupul fişierului pachet '%s'" +msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB a fost corupt, fişierul a fost redenumit %s.old" +msgstr "DB a fost corupt, fișierul a fost redenumit %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -"Formatul DB este nevalid. Dacă l-aÅ£i înnoit pe apt de la o versiune mai " -"veche, ştergeÅ£i şi recreaÅ£i baza de date." +"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " +"veche, ștergeți și recreați baza de date." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Nu pot deschide fişierul DB %s: %s" +msgstr "Nu s-a putut deschide fișierul DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Eşuare în determinarea stării %s" +msgstr "Eșec la „stat” pentru %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "Nu pot obÅ£ine un cursor" +msgstr "Nu s-a putut obține un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "A: Nu pot citi directorul %s\n" +msgstr "A: Nu s-a putut citi directorul %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "A: Nu pot determina starea %s\n" +msgstr "A: Nu s-a putut efectua „stat” pentru %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E: Erori la fişierul " +msgstr "E: Erori la fișierul " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Eşuare în a rezolva %s" +msgstr "Eșec la „resolve” pentru %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Eşuare în parcurgerea arborelui" +msgstr "Parcurgerea arborelui a eșuat" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Eşuare la deschiderea %s" +msgstr "Eșec la „open” pentru %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dezlegare %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Eşuare la citirea legăturii %s" +msgstr "Eșec la „readlink” pentru %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Eşuare în desfacerea legăturii %s" +msgstr "Eșec la „unlink” pentru %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Eşuare în legarea %s de %s" +msgstr "*** Eșec la „link” între %s și %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Eroare internă, nu pot localiza membrul %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Eşuare în alocarea memoriei" +msgstr "realloc - Eșec la alocarea memoriei" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Nu pot deschide %s" +msgstr "Nu s-a putut deschide %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Înlocuire greşită %s linia %lu #1" +msgstr "Înlocuire greșită %s linia %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Înlocuire greşită %s linia %lu #2" +msgstr "Înlocuire greșită %s linia %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Înlocuire greşită %s linia %lu #3" +msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Eşuare la citirea fişierului de înlocuire %s" +msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritm de compresie necunoscut '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Eşuare în crearea conexiunii IPC către subproces" +msgstr "Eșec la crearea conexiunii IPC către subproces" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Eşuare în crearea FIŞIERULUI*" +msgstr "Eșec la crearea FIȘIERULUI*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Eşuare în bifurcare" +msgstr "Eșec la „fork”" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Comprimare copil" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Eroare internă, eşuare în a crea %s" +msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Eşuare în a crea subprocesul IPC" +msgstr "Eșec la crearea IPC-ului pentru subproces" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Eşuare în executarea compresorului" +msgstr "Eșec la executarea compresorului" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "decompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IE către subproces/fişier eşuat" +msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Eşuare la citire în timpul calculării MD5" +msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Eşuare în a redenumi %s în %s" +msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "Următoarele pachete au dependenÅ£e neîndeplinite:" +msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "dar nu este instalat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " sau" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "Următoarele pachete vor fi ŞTERSE:" +msgstr "Următoarele pachete vor fi ȘTERSE:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "Următoarele pachete au fost reÅ£inute:" +msgstr "Următoarele pachete au fost reținute:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Următoarele pachete Å£inute vor fi schimbate:" +msgstr "Următoarele pachete ținute vor fi schimbate:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"AVERTISMENT: Următoarele pachete esenÅ£iale vor fi şterse.\n" -"Aceasta NU ar trebui făcută decât dacă ştiÅ£i exact ce vreÅ£i!" +"AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" +"Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu de şters şi %lu neînnoite.\n" +msgstr "%lu de șters și %lu neînnoite.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu instalate sau şterse incomplet.\n" +msgstr "%lu instalate sau șterse incomplet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Corectez dependenÅ£ele..." +msgstr "Corectez dependențele..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." -msgstr " eşuare." +msgstr " eșec." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "Nu pot corecta dependenÅ£ele" +msgstr "Nu s-au putut corecta dependențele" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Nu pot micşora mulÅ£imea pachetelor de înnoire" +msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "AÅ£i putea să porniÅ£i 'apt-get -f install' pentru a corecta acestea." +msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "DependenÅ£e neîndeplinite. ÎncercaÅ£i să folosiÅ£i -f." +msgstr "Dependențe neîndeplinite. Încercați să folosiți -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "InstalaÅ£i aceste pachete fără verificare [y/N]? " +msgstr "Instalați aceste pachete fără verificare [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" +msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." +msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Nu pot încuia directorul de descărcare" +msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Lista surselor nu poate fi citită." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Ce ciudat.. Dimensiunile nu se potrivesc, scrieÅ£i la apt@packages.debian.org" +"Ce ciudat.. Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB de arhive.\n" +msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB de arhive.\n" +msgstr "Este nevoie să descărcați %sB de arhive.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "După despachetare va fi folosit %sB de spaÅ£iu suplimentar pe disc.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "După această operație vor fi folosiți din disc încă %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "După despachetare va fi eliberat %sB din spaÅ£iul de pe disc.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "N-am putut determina spaÅ£iul disponibil în %s" +msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "Nu aveÅ£i suficient spaÅ£iu în %s." +msgstr "Nu aveți suficient spațiu în %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -"A fost specificat 'doar neimportant' dar nu este o operaÅ£iune neimportantă." +"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "Da, fă cum îţi spun!" +msgstr "Da, fă cum îți spun!" -#: cmdline/apt-get.cc:868 +#: 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 "" -"SunteÅ£i pe cale de a face ceva cu potenÅ£ial distructiv.\n" -"Pentru a continua tastaÅ£i fraza '%s'\n" +"Sunteți pe cale de a face ceva cu potențial distructiv.\n" +"Pentru a continua tastați fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." -msgstr "RenunÅ£are." +msgstr "Renunțare." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "VreÅ£i să continuaÅ£i [Y/n]? " +msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Eşuare în aducerea %s %s\n" +msgstr "Eșec la aducerea lui %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Eşuare în descărcarea unor fişiere" +msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Descărcare completă şi în modul doar descărcare" +msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nu pot aduce unele arhive, poate porniÅ£i 'apt-get update' sau încercaÅ£i cu --" -"fix-missing?" +"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " +"update' sau încercați cu --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" +msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" +msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" +msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Ar trebui să alegeÅ£i în mod explicit unul pentru instalare." +msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1091 +#: 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 "" -"Pachetul %s nu este disponibil, dar este menÅ£ionat de către alt pachet.\n" -"Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" +"Pachetul %s nu este disponibil, dar este menționat de către alt pachet.\n" +"Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1384 +# XXX: orice sugestie este bine-venită +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Folosiți 'apt-get autoremove' pentru a le șterge." + +#: 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 "" -"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " -"fost folosite în loc unele vechi." +"Hmm, se pare că AutoRemover a distrus ceva, lucru care n-ar trebui să se " +"întâmple. Sunteți rugat să trimiteți un raportați de defect pentru pachetul " +"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 "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nu s-a putut găsi sarcina %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s este marcat ca fiind instalat manual.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:" +msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"DependenÅ£e neîndeplinite. ÎncercaÅ£i 'apt-get -f install' fără nici un pachet " -"(sau oferiÅ£i o altă soluÅ£ie)." +"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " +"(sau oferiți o altă soluție)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că aÅ£i " +"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că ați " "cerut\n" -"o situaÅ£ie imposibilă sau că folosiÅ£i distribuÅ£ia instabilă în care unele " +"o situație imposibilă sau că folosiți distribuția instabilă în care unele " "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1569 -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 "" -"Din moment ce doar aÅ£i cerut o singură operaÅ£iune este extrem de probabil\n" -" că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" -"acest pachet ar trebui completat." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" -msgstr "Eşuare" +msgstr "Eșec" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "Trebuie specificat cel puÅ£in un pachet pentru a-i aduce sursa" +msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "Nu pot găsi o sursă pachet pentru %s" +msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Sar peste fişierul deja descărcat '%s'\n" +msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" +msgstr "Nu aveți suficient spațiu în %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB/%sB din arhivele surselor.\n" +msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Este nevoie să descărcaÅ£i %sB din arhivele surselor.\n" +msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Eşuare în a aduce unele arhive." +msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Comanda de despachetare '%s' eşuată.\n" +msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "VerificaÅ£i dacă pachetul 'dpkg-dev' este instalat.\n" +msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Comanda de construire '%s' eşuată.\n" +msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" -msgstr "Eşuare proces copil" +msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Trebuie specificat cel puÅ£in un pachet pentru a-i verifica dependenÅ£ele " +"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Nu pot prelua informaÅ£iile despre dependenÅ£ele înglobate ale lui %s" +msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s nu are dependenÅ£e înglobate.\n" +msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " +"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2282 +#: 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 "" -"DependenÅ£a lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " +"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Eşuare în a satisface dependenÅ£a lui %s de %s: Pachetul instalat %s este " +"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Eşuare în a satisface dependenÅ£a lui %s de %s: %s" +msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "DependenÅ£ele înglobate pentru %s nu pot fi satisfăcute." +msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Eşuare în a prelucra dependenÅ£ele înglobate" +msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1231,6 +1271,8 @@ msgid "" " 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" @@ -1246,7 +1288,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1257,44 +1299,47 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Utilizare: apt-get [opÅ£iuni] comanda\n" -" apt-get [opÅ£iuni] install|remove pachet1 [pachet2 ...]\n" -" apt-get [opÅ£iuni] source pachet1 [pachet2 ...]\n" +"Utilizare: apt-get [opțiuni] comanda\n" +" apt-get [opțiuni] install|remove pachet1 [pachet2 ...]\n" +" apt-get [opțiuni] source pachet1 [pachet2 ...]\n" "\n" -"apt-get este o simplă interfaţă în linie de comandă pentru descărcarea şi\n" +"apt-get este o simplă interfață în linie de comandă pentru descărcarea și\n" "instalarea pachetelor. Cele mai frecvent folosite comenzi sunt update\n" -"şi install.\n" +"și install.\n" "\n" "Comenzi:\n" -" update - Aduce noile liste de pachete\n" +" update - Aduce listele noi de pachete\n" " upgrade - Realizează o înnoire\n" " install - Instalează pachete noi (pachet este libc6, nu libc6.deb)\n" -" remove - Şterge pachete\n" -" source - Descarcă arhivele sursă\n" -" build-dep - Configurează dependenÅ£ele înglobate pentru sursele " -"pachetelor\n" -" dist-upgrade - Înnoirea distribuÅ£iei, vedeÅ£i apt-get(8)\n" -" dselect-upgrade - Urmează selecÅ£iile dselect\n" -" clean - Şterge fişierele arhivă descărcate\n" -" autoclean - Şterge vechile fişiere arhivă descărcate\n" -" check - Verifică dacă există dependenÅ£e neîndeplinite\n" +" remove - Șterge pachete\n" +" autoremove - Șterge automat toate pachetele nefolosite\n" +" purge - Șterge și curăță pachete\n" +" source - Descarcă pachete-sursă\n" +" build-dep - Configurează dependențele de compilare pentru\n" +" pachetele-sursă\n" +" dist-upgrade - Înnoirea distribuției, a se vedea apt-get(8)\n" +" dselect-upgrade - Urmează selecțiile dselect\n" +" clean - Șterge fișierele-arhivă descărcate\n" +" autoclean - Șterge fișiere-arhivă descărcate învechite\n" +" check - Verifică dacă există dependențe neîndeplinite\n" "\n" -"OpÅ£iuni:\n" +"Opțiuni:\n" " -h Acest text de ajutor.\n" -" -q Afişare jurnalizabilă - fără indicator de progres\n" -" -qq Fără afişare, cu excepÅ£ia erorilor\n" +" -q Afișare jurnalizabilă - fără indicator de progres\n" +" -qq Fără afișare, cu excepția erorilor\n" " -d Doar descărcare - NU instala sau despacheta arhive\n" -" -s Fără acÅ£iune. Realizează o simulare\n" -" -y Presupune DA la toate întrebările şi nu solicita răspuns\n" -" -f Încercare de continuare dacă verificarea integrităţii eşuează\n" -" -m Încercare de continuare dacă arhivele sunt de negăsit\n" +" -s Fără acțiune. Realizează o simulare\n" +" -y Presupune DA ca răspuns la toate întrebările și nu\n" +" solicita răspuns\n" +" -f Încearcă corectarea unui sistem cu dependențe corupte\n" +" -m Încearcă continuarea dacă arhivele nu pot fi găsite\n" " -u Arată o listă de pachete ce pot fi înnoite\n" -" -b Construieşte sursa pachetului după aducere\n" -" -V Arată numerele versiunilor în mod logoreic\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -"VedeÅ£i manualul apt-get(8), sources.list(5) şi apt.conf(5)\n" -"pentru mai multe informaÅ£ii şi opÅ£iuni.\n" +" -b Construiește sursa pachetului după aducere\n" +" -V Arată versiunile în mod logoreic\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" +"Vedeți manualele apt-get(8), sources.list(5) și apt.conf(5)\n" +"pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" #: cmdline/acqprogress.cc:55 @@ -1316,7 +1361,7 @@ msgstr "Eroare" #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Adus %sB în %s (%sB/s)\n" +msgstr "Aduși: %sB în %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1330,9 +1375,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Schimbare de mediu: Vă rog introduceÅ£i discul numit\n" -" '%s'\n" -"în unitatea '%s' şi apăsaÅ£i Enter\n" +"Schimbare de mediu: introduceți discul numit\n" +" „%s”\n" +"în unitatea „%s” și apăsați Enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1351,364 +1396,371 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizare: apt-sortpkgs [opÅ£iuni] fişier1 [fişier2 ...]\n" +"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n" "\n" -"apt-sortpkgs este o unealtă simplă pentru sortarea fişierelor pachete. " -"OpÅ£iunea\n" -"-s este folosită pentru a indica ce fel de fişier este.\n" +"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n" +"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n" "\n" -"OpÅ£iuni:\n" +"Opțiuni:\n" " -h Acest text de ajutor\n" -" -s Foloseşte sortarea de fişiere sursă\n" -" -c=? Citeşte acest fişier de configurare\n" -" -o=? Ajustează o opÅ£iune de configurare arbitrară, ex.: -o dir::cache=/" +" -s Folosește sortarea de fișiere-sursă\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" "tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Ajustări implicite necorespunzătoare!" +msgstr "Configurări implicite necorespunzătoare!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "ApăsaÅ£i Enter pentru a continua." +msgstr "Apăsați Enter pentru a continua." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "S-au produs unele erori în timpul despachetării. Voi configura" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Doriți să ștergeți eventualele fișiere .deb descărcate anterior?" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" -msgstr "" -"pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate" +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "S-au produs unele erori în timpul despachetării. Se vor configura" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgid "packages that were installed. This may result in duplicate errors" msgstr "" -"sau erori cauzate de dependenÅ£e lipsă. Aceasta este normal, doar erorile" +"pachetele care au fost instalate. Aceasta ar putea rezulta erori duplicate" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "sau erori cauzate de dependențe lipsă. Fiind normal, doar erorile de" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"de deasupra acestui mesaj sunt importante. Vă rog corectaÅ£i-le şi porniÅ£i " -"din nou [I]nstalarea" +"deasupra acestui mesaj sunt importante. Corectați-le și reporniți [I]" +"nstalarea" #: dselect/update:30 msgid "Merging available information" -msgstr "Unirea informaÅ£iilor disponibile" +msgstr "Se combină informațiile disponibile" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Eşuare în crearea conexiunilor" +msgstr "Eșec la crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Eşuare în executarea gzip" +msgstr "Eșec la executarea lui gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Eşuarea sumei de control în arhiva tar, arhivă deteriorată" +msgstr "" +"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Tip antet TAR %u necunoscut, membru %s" +msgstr "Tip antet TAR %u necunoscut, membrul %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Semnătură de arhivă necorespunzătoare" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Eroare la citirea antetului membru al arhivei" +msgstr "Eroare la citirea antetului membrului arhivei" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Antet membru de arhivă necorespunzător" +msgstr "Antet de membru de arhivă necorespunzător" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiva este prea scurtă" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Eşuare la citirea antetelor de arhivă" +msgstr "Eșec la citirea antetelor arhivei" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "Chemat DropNode pe un nod încă legat" +msgstr "S-a chemat DropNode pe un nod încă „legat”" -#: apt-inst/filelist.cc:416 +# XXX: nu-mi place, fie e hash, fie „element de dispersie” +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Eşuare în localizarea elementului hash!" +msgstr "Eșec la localizarea elementului de dispersie!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Eşuare în alocarea diversiunii" +msgstr "Eșec la alocarea redirectării" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "Eroare internă în adăugare diversiune" +msgstr "Eroare internă în „AddDiversion”" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Încercare de suprascriere diversiune, %s -> %s şi %s/%s" +msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Adăugare dublă de diversiune %s -> %s" +msgstr "Adăugare dublă de redirectare %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Fişier de configurare duplicat %s/%s" +msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Eşuare în scrierea fişierului %s" +msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Eşuare în a închide fişierul %s" +msgstr "Eșec la închiderea fișierului %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Calea %s este prea lungă" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Despachetarea %s de mai multe ori" +msgstr "Se despachetează %s de mai multe ori" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "Directorul %s este distras" +msgstr "Directorul %s este redirectat" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pachetul încearcă să scrie în Å£inta de diversiune %s/%s" +msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Calea de diversiune este prea lungă" +msgstr "Calea de redirectare este prea lungă" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Directorul %s este înlocuit de un non-director" -#: apt-inst/extract.cc:283 +# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Eşuare în localizarea nodului din tranşa hash" +msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Calea este prea lungă" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Pachetul suprascris nu se potriveşte cu nici o versiune pentru %s" +msgstr "Pachet suprascris fără nici o versiune pentru %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" +msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Nu pot citi %s" +msgstr "Nu s-a putut citi %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Nu pot determina starea %s" +msgstr "Nu se poate executa „stat” pe %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Eşuare în ştergerea %s" +msgstr "Eșec la ștergerea lui %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Nu pot crea %s" +msgstr "Nu s-a putut crea %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Eşuare în a determina starea %sinfo" +msgstr "Eșec la „stat” pentru %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "" -"Directoarele de informaÅ£ii şi temporare trebuie să fie în acelaşi sistem de " -"fişiere" +msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Citire liste de pachete" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Eşuare în a schimba către directorul %sinfo" +msgstr "" +"Eșec la schimbarea directorului către directorul de administrare %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Eroare internă la preluarea numelui de pachet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Citire derulare fişier" +msgstr "Se citește lista de fișiere" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Eşuare în deschiderea fişierului listă '%sinfo/%s'. Dacă nu puteÅ£i restaura " -"acest fişier atunci goliÅ£i-l şi imediat reinstalaÅ£i aceeaşi versiune a " -"pachetului!" +"Eșec la deschiderea fișierului-listă '%sinfo/%s'. Dacă nu puteți restaura " +"acest fișier atunci goliți-l și, apoi, imediat reinstalați aceeași versiune " +"a pachetului!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Eşuare la citirea fişierului listă %sinfo/%s" +msgstr "Citirea fișierului-listă %sinfo/%s a eșuat" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Eroare internă la preluarea unui nod" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Eşuare la deschiderea fişierului de diversiuni %sdiversions" +msgstr "Eșec la deschiderea fișierului de redirectări %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Fişierul diversiune este deteriorat" +msgstr "Fișierul-redirectare este deteriorat" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Linie necorespunzătoare în fişierul diversiune: %s" +msgstr "Linie necorespunzătoare în fișierul-redirectare: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Eroare internă în timpul adăugării unei diversiuni" +msgstr "Eroare internă în timpul adăugării unei redirectări" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Cache-ul pachetului trebuie întâi iniÅ£ializat" +msgstr "Cache-ul de pachete trebuie mai întâi inițializat" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Eşuare în a găsi un pachet: antet, ofset %lu" +msgstr "Eșec la găsirea unui antet „Package:”, deplasamentul este %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "SecÅ£iune necorespunzătoare ConfFile în fişierul de stare. Offset %lu" +msgstr "" +"Secțiune necorespunzătoare ConfFile în fișierul de stare. Deplasamentul este " +"%lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Eroare la analiza MD5. Offset %lu" +msgstr "Eroare la analiza MD5. Deplasamentul este %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'" +msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Aceasta nu este o arhivă DEB validă, nu are membrul '%s' sau '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Aceasta nu este o arhivă DEB validă, nu are unul din următorii membri „%s”, " +"„%s” sau „%s”" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Nu pot schimba la %s" +msgstr "Nu s-a putut schimba directorul la %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "Eroare internă, nu pot localiza membrul" +msgstr "Eroare internă, nu a putut fi localizat membrul" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Eşuare de localizare a unui fişier de control valid" +msgstr "Eșec la localizare a unui fișier de control valid" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Fişier de control neanalizabil" +msgstr "Fișier de control neanalizabil" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Nu pot citi baza de date a cdrom-ului %s" +msgstr "Nu s-a putut citi baza de date de CD %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 "" -"Vă rog folosiÅ£i apt-cdrom pentru a face recunoscut acest CD de către APT. " -"'apt-get update' nu poate fi folosit pentru adăugarea de noi CD-uri" +"Folosiți apt-cdrom pentru a-l face pe APT să recunoască acest CD. „apt-get " +"update” nu poate fi folosit pentru adăugarea de noi CD-uri" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD-ROM necorespunzător" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat." +msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Fişier negăsit" +msgstr "Fișier negăsit" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Eşuare de determinare a stării" +msgstr "Eșec la „stat”" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Eşuare la ajustarea timpului" +msgstr "Eșec la ajustarea timpului de modificare" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI invalid, URIS local trebuie sa nu înceapă cu //" +msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1717,44 +1769,44 @@ msgstr "Se autentifică" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Nu pot determina numele pereche" +msgstr "Nu se poate detecta numele perechii" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Nu pot determina numele local" +msgstr "Nu s-a putut detecta numele local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Serverul ne-a refuzat conectarea şi a spus: %s" +msgstr "Serverul a refuzat conexiunea și a spus: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Eşuare UTILIZATOR, serverul a spus: %s" +msgstr "„USER” a eșuat, serverul a spus: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Eşuare PAROLĂ, serverul a spus: %s" +msgstr "„PASS” a eșuat, serverul a spus: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Un server proxy a fost specificat dar nu exista nici un script de conectare, " +"Un server proxy a fost precizat, dar nu există nici un script de conectare, " "Acquire::ftp::ProxyLogin este gol." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Script comandă de conectare '%s' eşuat, serverul a spus: %s" +msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Eşuare TIP, serverul a spus: %s" +msgstr "„TYPE” a eșuat, serverul a spus: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1762,55 +1814,57 @@ msgstr "Timpul de conectare a expirat" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Serverul a terminat conexiunea" +msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Un răspuns a inundat zona tampon." +msgstr "Un răspuns a depășit zona de tampon." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Degradare protocol" +msgstr "Protocol corupt" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Nu pot crea un socket" +msgstr "Nu s-a putut crea un socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Nu pot conecta data socket, timpul de conectare a expirat" +msgstr "" +"Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a " +"expirat" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Nu pot conecta socket pasiv" +msgstr "Nu s-a putut realiza conectarea la un socket pasiv" #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo n-a reuşit să obÅ£ină un socket de ascultare" +msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Nu pot lega un socket" +msgstr "Nu s-a putut realiza asocierea la un socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Nu pot asculta pe un socket" +msgstr "Nu s-a putut asculta pe socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Nu pot determina numele socket-ului" +msgstr "Nu s-a putut detecta numele socket-ului" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "Nu pot trimite comanda PORT" +msgstr "Nu s-a putut trimite comanda PORT" #: methods/ftp.cc:789 #, c-format @@ -1820,33 +1874,33 @@ msgstr "Familie de adrese necunoscută %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Eşuare EPRT, serverul a spus: %s" +msgstr "„EPRT” a eșuat, serverul a spus: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Timp de conectare data socket expirat" +msgstr "Timpul de conectare la socket-ul de date expirat" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "Nu pot accepta conexiune" +msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problemă la indexarea fişierului" +msgstr "Problemă la calcularea dispersiei pentru fișierul" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Nu pot aduce fişierul, serverul a spus '%s" +msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Timp expirat pentru data socket" +msgstr "Timp expirat pentru socket-ul de date" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Eşuare transfer de date, serverul a spus: '%s'" +msgstr "Transferul de date a eșuat, serverul a spus: '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1855,793 +1909,845 @@ msgstr "Interogare" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "Nu pot invoca" +msgstr "Nu s-a putut invoca" -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectare la %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Nu pot crea un socket pentru %s (f=%u t=%u p=%u)" +msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Nu pot iniÅ£ia conectarea la %s:%s (%s)." +msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat" +msgstr "" +"Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "N-am putut conecta la %s:%s (%s)." +msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Nu pot rezolva '%s'" +msgstr "Nu s-a putut rezolva „%s”" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Eşuare temporară în rezolvarea '%s'" +msgstr "Eșec temporar la rezolvarea lui „%s”" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)" +msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Nu pot conecta la %s %s" +msgstr "Nu s-a putut realiza conexiunea cu %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Nu pot accesa keyring: '%s'" +msgstr "Nu s-a putut accesa inelul de chei: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies." +msgstr "" +"E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia " -"amprentei digitale?!" +"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " +"amprenta digitale a cheii?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Cel puÅ£in o semnătură invalidă a fost întâlnită." +msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)" +"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "Următoarele semnături au fost invalide:\n" +msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Următoarele semnături n-au putut fi verificate datorită cheii publice care " -"este indisponibilă:\n" +"Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " +"este disponibilă:\n" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Nu pot deschide conexiunea pentru %s" +msgstr "Nu s-a putut deschide conexiunea pentru %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "În aşteptarea antetelor" +msgstr "În așteptarea antetelor" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" -msgstr "Primit o singură linie de antet peste %u caractere" +msgstr "S-a primit o singură linie de antet de peste %u caractere" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "Serverul http a trimis un antet de răspuns necorespunzător" +msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Serverul http a trimis un antet lungime-conÅ£inut necorespunzător" +msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Serverul http a trimis un antet zonă de conÅ£inut necorespunzător" +msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Acest server http are zonă de suport necorespunzătoare" +msgstr "Acest server HTTP are un suport defect de intervale" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" -msgstr "Format de date necunoscut" +msgstr "Format dată necunoscut" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" -msgstr "Eşuarea selecÅ£iei" +msgstr "Selecția a eșuat" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Eroare la scrierea fişierului de rezultat" +msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "Eroare la scrierea în fişier" +msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Eroare la scrierea în fişierul" +msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" +"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "Eroare la citirea de pe server" +msgstr "Eroare la citirea de la server" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Eșec la trunchierea fișierului" -#: methods/http.cc:1106 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Conectare eşuată" +msgstr "Conectare eșuată" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Eroare internă" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Nu pot mmap un fişier gol" +msgstr "Nu s-a putut executa „mmap” cu un fișier gol" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Nu pot face mmap la %lu bytes" +msgstr "Nu s-a putut face mmap cu %lu octeți" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "SelecÅ£ia %s nu s-a găsit" +msgstr "Selecția %s nu a fost găsită" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Tip de prescurtare nerecunoscut: '%c'" +msgstr "Abreviere de tip nerecunoscut: „%c”" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "Deschidere fişier de configurare %s" +msgstr "Se deschide fișierul de configurare %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Linie %d prea lungă (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Eroare de sintaxă %s:%u: etichetă greşită" +msgstr "Eroare de sintaxă %s:%u: etichetă greșită" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior" +"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului" +msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Eroare!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Terminat" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "OpÅ£iunea linie de comandă '%c' [din %s] este necunoscută." +msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "OpÅ£iunea linie de comandă %s nu este înÅ£eleasă" +msgstr "Opțiunea linie de comandă %s nu este înțeleasă" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "OpÅ£iunea linie de comandă %s nu este booleană" +msgstr "Opțiunea linie de comandă %s nu este booleană" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "OpÅ£iunea %s necesită un argument" +msgstr "Opțiunea %s necesită un argument" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -"OpÅ£iunea %s: SpecificaÅ£ia configurării articolului trebuie să aibă o =." +"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "OpÅ£iunea %s necesită un argument integru, nu '%s'" +msgstr "Opțiunea %s necesită un argument integru, nu '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "OpÅ£iunea '%s' este prea lungă" +msgstr "Opțiunea '%s' este prea lungă" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Sensul %s nu este înÅ£eles, încercaÅ£i adevărat (true) sau fals (false)." +msgstr "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (false)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "OperaÅ£iune invalidă %s" +msgstr "Operațiune invalidă %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Nu pot schimba la %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Eşuare la determinarea stării cdrom-ului" +msgstr "Eșec la „stat” pentru CD" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Nu s-a folosit închiderea pentru fişierul disponibil doar-citire %s" +msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Nu pot deschide fişierul blocat %s" +msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Nu este folosit blocajul pentru fişierul montat nfs %s" +msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Aşteptat %s, dar n-a fost acolo" +msgstr "Așteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "Nu pot deschide fişierul %s" +msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "Problemă la închiderea fişierului" +msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Problemă la dezlegarea fişierului" +msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "Problemă în timpul sincronizării fişierului" +msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache gol de pachet" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Cache-ul fişierului pachet este deteriorat" +msgstr "Cache-ul fișierului pachet este deteriorat" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Fişierul cache al pachetului este o versiune incompatibilă" +msgstr "Fișierul cache al pachetului este o versiune incompatibilă" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Acest APT nu suportă versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pre-depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugerează" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomandă" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Este în conflict" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" -msgstr "Înlocuieşte" +msgstr "Înlocuiește" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Învechit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Corupe" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cerut" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" -msgstr "opÅ£ional" +msgstr "opțional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Se construieşte arborele de dependenţă" +msgstr "Se construiește arborele de dependență" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Versiuni candidat" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" -msgstr "Generare dependenÅ£e" +msgstr "Generare dependențe" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Se citesc informațiile de stare" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Eșec la deschiderea fișierului de stare %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Eșec la scrierea fișierului temporar de stare %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Nu pot analiza fişierul pachet %s (1)" +msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Nu pot analiza fişierul pachet %s (2)" +msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Linie greşită %lu în lista sursă %s (URI)" +msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Linie greşită %lu în lista sursă %s (dist)" +msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Linie greşită %lu în lista sursă %s (analiza URI)" +msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)" +msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" +msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Linie greşită %u în lista sursă %s (tip)" +msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" +msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"Aceasta instalare va avea nevoie de ştergerea temporară a pachetului " -"esenÅ£ial %s din cauza unui bucle conflict/pre-dependenţă. Asta de multe ori " -"nu-i de bine, dar dacă vreÅ£i întradevăr s-o faceÅ£i, activaÅ£i opÅ£iunea APT::" +"Aceasta instalare va avea nevoie de ștergerea temporară a pachetului " +"esențial %s din cauza unui bucle conflict/pre-dependență. Asta de multe ori " +"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::" "Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Tipul de fişier index '%s' nu este suportat" +msgstr "Tipul de fișier index '%s' nu este suportat" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " -"cauzată de pachete Å£inute." +"cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Nu pot corecta problema, aÅ£i Å£inut pachete deteriorate." +msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au " +"fost folosite în loc unele vechi." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." -msgstr "Directorul de liste %spartial lipseşte." +msgstr "Directorul de liste %spartial lipsește." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Directorul de arhive %spartial lipseşte." +msgstr "Directorul de arhive %spartial lipsește." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Se descarcă fişierul %li din %li (%s rămas)" +msgstr "Se descarcă fișierul %li din %li (%s rămas)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "Se descarcă fişierul %li din %li" +msgstr "Se descarcă fișierul %li din %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metoda driver %s nu poate fi găsită." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Vă rog introduceÅ£i discul numit: '%s' în unitatea '%s' şi apăsaÅ£i Enter." +"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Nu pot determina un tip de sistem de pachete potrivit" +msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nu pot determina starea %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Trebuie să puneÅ£i nişte 'surse' de URI în sources.list" +msgstr "Trebuie să puneți niște 'surse' de URI în sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Listele de pachete sau fişierul de stare n-au putut fi analizate sau " +"Listele de pachete sau fișierul de stare n-au putut fi analizate sau " "deschise." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" -"AÅ£i putea vrea să porniÅ£i 'apt-get update' pentru a corecta aceste probleme." +"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Înregistrare invalidă în fişierul de preferinÅ£e, fără antet de pachet" +msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Nu s-a înÅ£eles tipul de pin %s" +msgstr "Nu s-a înțeles tipul de pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Eroare apărută în timpul procesării %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Eroare apărută în timpul procesării %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Eroare apărută în timpul procesării %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Eroare apărută în timpul procesării %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Eroare apărută în timpul procesării %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Eroare apărută în timpul procesării %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Mamăăă, aÅ£i depăşit numărul de nume de pachete de care este capabil acest " +"Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Mamăăă, aÅ£i depăşit numărul de versiuni de care este capabil acest APT." +"Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Mamăăă, aÅ£i depăşit numărul de dependenÅ£e de care este capabil acest APT." +"Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Nu s-a găsit pachetul %s %s în timpul procesării dependenÅ£elor de fişiere" +"Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Colectare furnizori fişier" +msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "redenumire eşuată, %s (%s -> %s)." +msgstr "redenumire eșuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Nepotrivire la suma de căutare" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " -"că aveÅ£i nevoie să reparaÅ£i manual acest pachet (din pricina unui arch lipsă)" +"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " +"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " -"că aveÅ£i nevoie să depanaÅ£i manual acest pachet." +"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " +"că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " +"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Blocul vânzător %s nu conÅ£ine amprentă" +msgstr "Blocul vânzător %s nu conține amprentă" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2650,47 +2756,61 @@ msgstr "" "Utilizare puct de montare CD-ROM %s\n" "Montare CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificare.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Se demontează CD-ul...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Demontare CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "Aştept discul...\n" +msgstr "Aștept discul...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Scanez discul de fişierele index..\n" +msgstr "Scanez discul de fișierele index..\n" + +# DEVELOPERS: please consider using somehow plural forms +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri " +"de traduceri și %zu semnături\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n" +msgid "Found label '%s'\n" +msgstr "A fost găsită eticheta „%s”\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "Acesta nu este un nume valid, mai încercaÅ£i.\n" +msgstr "Acesta nu este un nume valid, mai încercați.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2699,98 +2819,163 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Demontez CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "S-au scris %i înregistrări cu %i fişiere lipsă.\n" +msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n" +msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" -"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" +"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Se instalează %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Se configurează %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Se șterge %s" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Se rulează declanșatorul post-instalare %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Directorul „%s” lipsește." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "Se pregăteşte %s" +msgstr "Se pregătește %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Se pregăteşte configurarea %s" +msgstr "Se pregătește configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Se configurează %s" +msgid "Processing triggers for %s" +msgstr "Se procesează declanșatorii pentru %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Se pregăteşte ştergerea lui %s" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Se şterge %s" +msgstr "Se pregătește ștergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "Şters %s" +msgstr "Șters %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "Se pregăteşte ştergerea completă a %s" +msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "Şters complet %s" +msgstr "Șters complet %s" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Nu pot deschide fişierul %s" +msgstr "Nu s-a putut peteci fișierul" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "MMap-ul dinamic a rămas fără spațiu" + +#~ 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 "" +#~ "Din moment ce doar ați cerut o singură operațiune este extrem de " +#~ "probabil\n" +#~ " că pachetul pur și simplu nu este instalabil și un raport de eroare " +#~ "pentru\n" +#~ "acest pachet ar trebui completat." + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linia %d e prea lungă (max %lu)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Linie %d prea lungă (max %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Etichetă memorată: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Găsite %i indexuri de pachete, %i indexuri de surse și %i semnături\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Eșuarea selecției" diff --git a/po/ru.po b/po/ru.po index 6b28c45..04fbc98 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,4 +1,4 @@ -# translation of apt_ru.po to Russian +# translation of ru.po to Russian # Russian messages for the apt suite. # # Vadim Kutchin , 2002. @@ -7,162 +7,170 @@ # Nikolai Prokoschenko , 2004. # Dmitry Astapov , 2004. # Dmitry Astapov , 2004. -# Yuri Kozlov , 2004, 2005, 2006. +# Yuri Kozlov , 2004, 2005, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: 0.6.46.2\n" +"Project-Id-Version: apt 0.7.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-16 21:53+0400\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-16 21:10+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Всего имён пакетов : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " Нормальных пакетов: " +msgstr " Обычных пакетов: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " Чисто виртуальных пакетов: " +msgstr " Полностью виртуальных пакетов: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Одиночных виртуальных пакетов: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Смешанных виртуальных пакетов: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " -msgstr " Пропущено: " +msgstr " Отсутствует: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Всего уникальных версий: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Всего уникальных описаний: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Всего зависимостей: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Всего отношений Версия/Файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Всего отношений Описание/Файл: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Всего отношений Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Всего развёрнутых строк: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Всего информации о зависимостях: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Пустого места в кэше: " +msgstr "Пустого места в кеше: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Общее пространство посчитанное для: " +msgstr "Полное учтённое пространство: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Вы должны задать ровно один шаблон" +msgstr "Вы должны задать только один шаблон" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(не найдено)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(отсутствует)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s для %s %s скомпилирован %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s для %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -185,8 +193,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -200,40 +208,40 @@ 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 [options] command\n" -" или: apt-cache [options] add file1 [file1 ...]\n" -" или: apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" или: apt-cache [options] showsrc pkg1 [pkg2 ...]\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 - низкоуровневый инструмент, использующийся для управления\n" -"двоичными кэш-файлами APT'а, а также для извлечения информации из них\n" +"apt-cache -- низкоуровневый инструмент, используемый для управления\n" +"двоичными кеш-файлами APT и поиску по ним\n" "Команды:\n" -" add - добавить файл пакета в кэш исходников\n" -" gencaches - построить оба кэша пакетов - бинарных и с исходными текстами\n" -" showpkg - общая информация о конкретном пакете\n" -" stats - основная статистика\n" -" dump - показать весь файл в сжатой форме\n" +" add - добавить файл пакета в кеш исходников\n" +" gencaches - построить оба кеша пакетов - двоичных и с исходным кодом\n" +" showpkg - показать общую информацию о конкретном пакете\n" +" stats - показать общую статистику\n" +" dump - показать весь файл в сокращённой форме\n" " dumpavail - выдать на stdout список доступных пакетов\n" " unmet - показать неудовлетворённые зависимости\n" " search - найти пакеты, имя которых удовлетворяет регулярному выражению\n" " show - показать информацию о пакете в удобочитаемой форме\n" " depends - показать информацию о зависимостях пакета построчно\n" " rdepends - показать информацию об обратных зависимостях пакета\n" -" pkgnames - показать имена всех пакетов\n" -" dotty - генерировать граф зависимостей пакетов в формате GraphVis\n" -" xvcg - генерировать граф зависимостей пакетов в формате xvcg\n" +" pkgnames - показать имена всех пакетов в системе\n" +" dotty - генерировать граф пакетов в формате GraphVis\n" +" xvcg - генерировать граф пакетов в формате xvcg\n" " policy - показать текущую политику выбора пакетов\n" "\n" -"Опции:\n" +"Параметры:\n" " -h Этот текст.\n" -" -p=? Кэш пакетов.\n" -" -s=? Кэш исходников.\n" +" -p=? Кеш пакетов.\n" +" -s=? Кеш пакетов исходного кода.\n" " -q Не показывать индикатор прогресса.\n" " -i Показывать только важные зависимости для команды unmet.\n" -" -c=? Читать указанный файл конфигурации.\n" -" -o=? Установить произвольную опцию конфигурации, к примеру, -o dir::cache=/" +" -c=? Читать указанный файл настройки.\n" +" -o=? Задать произвольный параметра настройки, например, -o dir::cache=/" "tmp\n" -"Подробности в страницах руководства apt-cache(8) и apt.conf(5).\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'" @@ -308,7 +316,7 @@ msgstr "" " -c=? Читать указанный конфигурационный файл\n" " -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -317,34 +325,34 @@ msgstr "Невозможно записать в %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" "Список расширений, допустимых для пакетов с исходными текстами, слишком " "длинен" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -424,314 +432,314 @@ msgstr "" " -s=? Указать файл переназначений (override) для пакетов с исходными " "текстами\n" " -q Не выводить сообщения в процессе работы\n" -" -d=? Указать кэширующую базу данных (не обязательно)\n" +" -d=? Указать кеширующую базу данных (не обязательно)\n" " --no-delink Включить режим отладки процесса удаления файлов\n" " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" " -c=? Использовать указанный конфигурационный файл\n" " -o=? Указать произвольный параметр конфигурации" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов `%s' отсутствуют некоторые файлы" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была повреждена, файл переименован в %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, попытка обновить %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -"Неправильный формат базы данных (DB). Если вы производили обновление apt, " -"удалите и пересоздайте базу данных." +"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " +"и создайте базу данных заново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не удалось прочитать каталог %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не удалось прочитать атрибуты %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Ошибки относятся к файлу '" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Не удалось проследовать по ссылке %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Не удалось совершить обход дерева" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Не удалось прочесть ссылку %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Не удалось удалить %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не удалось создать ссылку %s на %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутренняя ошибка, не удалось найти составную часть %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - не удалось выделить память" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Не удалось прочесть файл переназначений (override)%s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Неизвестный алгоритм сжатия '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" "Для получения сжатого вывода %s необходимо включить использования сжатия" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Не удалось создать FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Процесс-потомок, производящий сжатие" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "декомпрессор" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "но он не установлен" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -739,151 +747,153 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " не удалось." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Аутентификационное предупреждение не принято в внимание.\n" +msgstr "Предупреждение об аутентификации не принято в внимание.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " "пакетами!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Не читается перечень источников." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"После распаковки объем занятого дискового пространства возрастёт на %sB.\n" +"После данной операции, объём занятого дискового пространства возрастёт на %" +"sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -"После распаковки объем занятого дискового пространства уменьшится на %sB.\n" +"После данной операции, объём занятого дискового пространства уменьшится на %" +"sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -894,28 +904,28 @@ msgstr "" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -923,48 +933,48 @@ msgstr "" "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -975,77 +985,119 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 был как-то удалён, чего не должно\n" +"было случиться. Пожалуйста, отправьте сообщение об ошибке в пакете 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 "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Внутренняя ошибка, AutoRemover всё поломал" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Внутренняя ошибка, AllUpgrade все поломал" +msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %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:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" +msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:1546 +#: 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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1053,146 +1105,132 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Некоторые пакеты невозможно установить. Возможно, Вы просите невозможного,\n" -"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" -"ещё не созданы или были удалены из Incoming." +"Некоторые пакеты невозможно установить. Возможно, вы просите невозможного,\n" +"или же используете нестабильную версию дистрибутива, где запрошенные вами\n" +"пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1569 -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" -"Необходимо послать отчёт об этой ошибке." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Следующая информация возможно поможет Вам:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже загруженный файл '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1201,7 +1239,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1210,32 +1248,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1250,6 +1288,8 @@ msgid "" " 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" @@ -1265,7 +1305,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1276,50 +1316,53 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Использование: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" +"Использование: apt-get [параметры] команда\n" +" apt-get [параметры] install|remove pkg1 [pkg2 ...]\n" +" apt-get [параметры] source pkg1 [pkg2 ...]\n" "\n" -"apt-get - простой интерфейс командной строки для загрузки и\n" -"установки пакетов. Наиболее часто используемые команды - update \n" +"apt-get -- простой интерфейс командной строки для загрузки и\n" +"установки пакетов. Наиболее часто используемые команды -- update \n" "и install.\n" "\n" "Команды:\n" -" update - загрузить новые списки пакетов\n" -" upgrade - выполнить обновление пакетов\n" +" update - получить новые списки пакетов\n" +" upgrade - выполнить обновление\n" " install - установить новые пакеты (имя пакета указывается\n" " как libc6, а не libc6.deb)\n" " remove - удалить пакеты\n" +" autoremove - автоматически удалить все неиспользуемые пакеты\n" +" purge - удалить и вычистить пакеты\n" " source - загрузить архивы с исходными текстами\n" -" build-dep - загрузить все необходимое для сборки указанного\n" +" build-dep - загрузить всё необходимое для сборки указанного\n" " пакета из исходных текстов\n" -" dist-upgrade - обновить всю систему, подробнее - в apt-get(8)\n" +" dist-upgrade - обновить всю систему, подробнее в apt-get(8)\n" " dselect-upgrade - руководствоваться выбором, сделанным в dselect'е\n" -" clean - удалить загруженные архивы\n" -" autoclean - удалить старые загруженные архивы\n" +" clean - удалить загруженные файлы архивов\n" +" autoclean - удалить старые загруженные файлы архивов\n" " check - проверить наличие нарушенных зависимостей\n" "\n" -"Опции:\n" -" -h Этот текст.\n" -" -q Выводить сообщения, пригодные для записи в файл журнала.\n" -" Не выводить индикатор прогресса\n" -" -qq Выводить только сообщения об ошибках\n" -" -d только загрузить - не устанавливать и не распаковывать архивы\n" -" -s Не выполнять действия на самом деле. Имитация работы\n" -" -y Отвечать \"Да\" на все вопросы. Сами вопросы при этом не выводятся\n" +"Параметры:\n" +" -h этот текст\n" +" -q выводить сообщения, пригодные для записи в файл журнала,\n" +" не выводить индикатор хода работы\n" +" -qq выводить только сообщения об ошибках\n" +" -d только загрузить - НЕ устанавливать и не распаковывать архивы\n" +" -s не выполнять действия на самом деле, только имитация работы\n" +" -y отвечать \"Да\" на все вопросы, cами вопросы при этом не выводятся\n" " -f продолжать, даже если проверка целостности не прошла\n" " -m продолжать, даже если местоположение архивов неизвестно\n" -" -u показывать список обновляемых пакетов\n" -" -b компилировать пакет из исходных текстов после их загрузки\n" -" -c=? читать указанный файл конфигурации\n" -" -o=? установить произвольную опцию, например, -o dir::cache=/tmp\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" -"содержат больше информации.\n" -" This APT has Super Cow Powers.\n" +"содержат подробную информацию и описание параметров.\n" +" В APT есть коровья СУПЕРСИЛА.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "В кэше " +msgstr "В кеше " #: cmdline/acqprogress.cc:79 msgid "Get:" @@ -1327,21 +1370,21 @@ msgstr "Получено:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "Ign " +msgstr "Игн " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err " +msgstr "Ош " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Получено %sB за %s (%sB/c)\n" +msgstr "Получено %sБ за %s (%sБ/c)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Ожидание]" +msgstr " [Обработка]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1350,8 +1393,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Смена носителя: вставьте диск с меткой '%s' в устройство '%s' и нажмите " -"ввод\n" +"Смена носителя: вставьте диск с меткой\n" +" '%s'\n" +"в устройство '%s' и нажмите ввод\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1370,12 +1414,12 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Использование: apt-sortpkgs [options] file1 [file2 ...]\n" +"Использование: apt-sortpkgs [параметры] file1 [file2 ...]\n" "\n" "apt-sortpkgs - простой инструмент для сортировки списков пакетов. Опция -s\n" "используется, чтобы указать тип списка.\n" "\n" -"Опции:\n" +"Параметры:\n" " -h этот текст\n" " -s сортировать список файлов с исходными текстами\n" " -c=? читать указанный файл конфигурации\n" @@ -1385,25 +1429,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Неправильное значение по умолчанию!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Для продолжения нажмите ввод." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Удалить все ранее скачанные .deb файлы?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Во время распаковки возникли ошибки. Будет продолжен процесс настройки" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "установленных пакетов. Это может привести к повторению ошибок или" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "возникновению новых из-за неудовлетворённых зависимостей. Это нормально," -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1414,270 +1462,272 @@ msgstr "" msgid "Merging available information" msgstr "Объединение информации о доступных пакетах" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Не удалось создать порождённые процессы" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Неверная сигнатура архива" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Ошибка чтения заголовка элемента архива" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Неправильный заголовок элемента архива" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Слишком короткий архив" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Не удалось прочитать заголовки архива" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode вызван для узла, который ещё используется" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Не удалось найти элемент хэша!" +msgstr "Не удалось найти элемент хеша!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Не удалось создать diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Внутренняя ошибка в AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Попытка изменения diversion, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойное добавление diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Слишком длинный путь %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Повторная распаковка %s" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Каталог %s входит в список diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакет пытается писать в diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Путь diversion слишком длинен" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Каталог %s был заменён не-каталогом" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Не удалось разместить узел в хэше" +msgstr "Не удалось разместить узел в хеше" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Путь слишком длинен" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файлы заменяются содержимым пакета %s без версии" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Невозможно получить атрибуты %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Не удалось создать %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Не удалось получить атрибуты %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Чтение списков пакетов" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Не удалось сменить текущий каталог на административный каталог %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Внутренняя ошибка при получении имени пакета" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Чтение списков файлов в пакете" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Не удалось открыть список файлов '%sinfo/%s'. Если Вы не можете восстановить " -"его, то обнулите его и немедленно переустановите такую же версию пакета!" +"Не удалось открыть список файлов '%sinfo/%s'. Если вы не сможете " +"восстановить этот файл, то обнулите его и немедленно переустановите ту же " +"версию пакета!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Внутренняя ошибка при получении Node" +msgstr "Внутренняя ошибка при получении node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Не удалось открыть файл diversions %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Файл diversions повреждён" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Неверная строка в файле diversions: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Внутренняя ошибка при добавлении diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "В первую очередь должен быть проинициализирован кэш пакетов" +msgstr "В первую очередь должен быть проинициализирован кеш пакетов" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Не удалось найти заголовок Package:, смещение %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Неверная секция ConfFile в status-файле. Смещение %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Ошибка чтения контрольной суммы. Смещение %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Это неправильный DEB-архив - отсутствует составная часть '%s' или '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "" +"Это неправильный DEB-архив - отсутствует составная часть '%s', '%s' или '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Не могу перейти в каталог %s" +msgstr "Не удалось перейти в каталог %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "Внутренняя ошибка, не могу найти составную часть" +msgstr "Внутренняя ошибка, не удалось найти составную часть" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Не могу найти правильный control-файл" +msgstr "Не удалось найти правильный control-файл" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Не могу прочесть содержимое control-файла" +msgstr "Не удалось прочесть содержимое control-файла" #: methods/cdrom.cc:114 #, c-format @@ -1696,26 +1746,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Ошибочный CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Не удалось получить атрибуты" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1726,7 +1775,7 @@ msgstr "Неправильный URI, локальный URI не должен #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Вход в систему " +msgstr "Вход в систему" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" @@ -1779,7 +1828,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1791,7 +1840,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -1802,7 +1851,7 @@ msgstr "Не удалось создать сокет" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" -"Не могу присоединиться к сокету данных, время на установление соединения " +"Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" #: methods/ftp.cc:704 @@ -1819,7 +1868,7 @@ msgstr "Невозможно присоединиться к сокету" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Не могу принимать соединения на сокете" +msgstr "Не удалось принимать соединения на сокете" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" @@ -1847,9 +1896,9 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Проблема при хэшировании файла" +msgstr "Проблема при хешировании файла" #: methods/ftp.cc:877 #, c-format @@ -1874,60 +1923,60 @@ msgstr "Запрос" msgid "Unable to invoke " msgstr "Невозможно вызвать " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Не могу найти IP адрес для %s" +msgstr "Не удалось найти IP адрес для %s" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" @@ -1937,42 +1986,43 @@ msgstr "Невозможно соединиться с %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Нет доступа к связке (keyring) ключей: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " "работы." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Не удалось выполнить '%s' для проверки подписи (gnupg установлена?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" +"Следующие подписи не могут быть проверены, так как недоступен открытый " +"ключ:\n" #: methods/gzip.cc:64 #, c-format @@ -1984,436 +2034,461 @@ msgstr "Не удалось открыть канал для %s" msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Не удалось обрезать файл" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Внутренняя ошибка" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Невозможно отобразить в память пустой файл" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла конфигурации %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Строка %d слишком длинна (максимум %d)." - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." -#: apt-pkg/contrib/configuration.cc:627 +#: 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:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: директивы могут задаваться только на верхнем " "уровне" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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 вызвана include из этого места" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Ошибка!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестная опция командной строки '%c' [из %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Опция командной строки %s - не логический переключатель \"да/нет\"" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s требует аргумента." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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: значение должно иметь вид =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s требует аргумент в виде целого числа, а не '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Слишком длинная опция '%s'" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смысл %s не ясен, используйте true или false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Неверная операция %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Не могу открыть файл блокировки %s" +msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "Не могу получить доступ к файлу блокировки %s" +msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "Не могу открыть файл %s" +msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Кэш пакетов пуст" +msgstr "Кеш пакетов пуст" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Кэш пакетов повреждён" +msgstr "Кеш пакетов повреждён" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Не поддерживаемая версия кэша пакетов" +msgstr "Не поддерживаемая версия кеша пакетов" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Данный APT не поддерживает Систему Версий '%s'" +msgstr "Данный APT не поддерживает систему версий '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Кэш пакетов был собран для другой архитектуры" +msgstr "Кеш пакетов был собран для другой архитектуры" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ПредЗависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлагает" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Рекомендует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменяет" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Замещает" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Ломает" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важный" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "необходимый" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "необязательный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "дополнительный" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Версии-кандидаты" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Генерирование зависимостей" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Чтение информации о состоянии" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Не удалось открыть StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %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:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Невозможно прочесть содержимое пакета %s (2)" +msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип '%s' в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2423,20 +2498,21 @@ msgstr "" "Вследствие возникновения циклических зависимостей типа Конфликтует/" "ПредЗависит, для продолжения установки необходимо временно удалить " "существенно важный пакет %s. Это может привести к фатальным последствиям. " -"Если Вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." +"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа '%s'" -#: apt-pkg/algorithms.cc:241 +#: 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:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2444,205 +2520,230 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты." +msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Некоторые индексные файлы не загрузились, они были проигнорированы или " +"вместо них были использованы старые версии" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Каталог %spartial отсутствует." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Загружается файл %li из %li (%s осталось)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Загружается файл %li из %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:377 +#: 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' и нажмите ввод." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Невозможно получить атрибуты %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Вы должны заполнить sources.list, поместив туда URI источников пактов" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Списки пакетов или status-файл не могут быть открыты или прочитаны." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Неверная запись в файле preferences: отсутствует заголовок Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Кэш имеет несовместимую систему версий" +msgstr "Кеш имеет несовместимую систему версий" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Произошла ошибка во время обработки %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "Превышено допустимое количество имён пакетов." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Превышено допустимое количество версий." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Вах, превышено допустимое количество описаний, с которым может работать APT." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Превышено допустимое количество зависимостей." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов" +msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Хеш сумма не совпадает" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "Недоступен общий ключ для следующих ключей (ID):\n" +msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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. Это может означать, что Вам " -"придётся вручную исправить этот пакет (возможно, пропущен arch)" +"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " +"вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1242 +#: 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. Это может означать, что Вам " -"придётся вручную исправить этот пакет." +"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " +"вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2651,7 +2752,7 @@ msgstr "Не совпадает размер" msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2660,49 +2761,60 @@ msgstr "" "В качестве точки монтирования CD-ROM используется %s\n" "Монтируется CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Идентификация.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Размонтирование CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n" -"и %i для сигнатур\n" +"Найдено индексов: %zu для пакетов, %zu для пакетов c исходными текстами, %zu " +"для переводов и %zu для сигнатур\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Найдена метка %s\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2711,99 +2823,124 @@ msgstr "" "Название диска: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Копирование списков пакетов..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Размонтирование CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Устанавливается %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Настройка %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Удаление %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Выполняется послеустановочный триггер %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Каталог %s отсутствует" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для конфигурации %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Настройка %s" +msgid "Processing triggers for %s" +msgstr "Обрабатываются триггеры для %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Удаление %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %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" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Не могу открыть файл %s" +msgstr "Не удалось пропатчить файл" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Выход за границы диапазона при работе MMap" diff --git a/po/sk.po b/po/sk.po index e507966..03573a9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,157 +3,169 @@ # initial sk.po made from Czech translation (cs.po) # thanks to Miroslav Kure # +# Peter Mann , 2006. +# Ivan Masár , 2008. +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-10 18:50+0200\n" -"Last-Translator: Peter Mann \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-12 23:06+0100\n" +"Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verzie %s má nesplnené závislosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Balík %s sa nedá nájsÅ¥" +msgstr "Nedá sa nájsÅ¥ balík %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Celkom názvov balíkov: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normálnych balíkov: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čisto virtuálnych balíkov: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálnych balíkov: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " ZmieÅ¡aných virtuálnych balíkov: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Chýbajúcich: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Celkom rôznych verzií: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Celkom rôznych popisov: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Celkom závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Celkom vzÅ¥ahov ver/súbor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Celkom vzÅ¥ahov popis/súbor: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Celkom poskytnutých mapovaní: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Celkom globovaných reÅ¥azcov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celkom miesta závislých verzií: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celkom jalového miesta: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Musíte zadaÅ¥ práve jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache je neaktuálna, nedá sa odvolaÅ¥ na súbor balíka" +msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolaÅ¥ na súbor balíka" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nenájdené)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " NainÅ¡talovaná verzia: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(žiadna)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s pre %s %s skompilovaný na %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s pre %s skompilovaný %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -206,19 +218,19 @@ msgstr "" " showsrc - Zobrazí zdrojové záznamy\n" " stats - Zobrazí základné Å¡tatistiky\n" " dump - Zobrazí celý súbor v zhustenej podobe\n" -" dumpavail - Vypíše súbor dostupných balíkov na Å¡tandartný výstup\n" +" dumpavail - Vypíše súbor dostupných balíkov na Å¡tandardný výstup\n" " unmet - Zobrazí nesplnené závislosti\n" " search - Prehľadá zoznam balíkov podľa regulárneho výrazu\n" " show - Zobrazí prehľadné informácie o balíku\n" " depends - Zobrazí základné údaje o závislostiach balíka\n" " rdepends - Zobrazí údaje o spätných závislostiach balíka\n" -" pkgnames - Vypíše zoznam názvov vÅ¡etkých balíkov\n" -" dotty - Vytvorí diagramy balíka pre GraphVis\n" +" pkgnames - Vypíše zoznam názvov vÅ¡etkých balíkov v systéme\n" +" dotty - Vytvorí diagramy balíka pre GraphViz\n" " xvcg - Vytvorí diagramy balíka pre xvcg\n" " policy - Zobrazí nastavenia zásad\n" "\n" "Voľby:\n" -" -h Táto nápoveda.\n" +" -h Tento pomocník.\n" " -p=? Vyrovnávacia pamäť balíkov.\n" " -s=? Vyrovnávacia pamäť zdrojov.\n" " -q Nezobrazí indikátor priebehu.\n" @@ -229,7 +241,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Zadajte názov tohto disku, napríklad 'Debian 2.1r1 Disk 1'" +msgstr "Zadajte názov tohto disku, napríklad „Debian 2.1r1 Disk 1“" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -237,7 +249,7 @@ msgstr "Vložte disk do mechaniky a stlačte Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Zopakujte tento proces pre vÅ¡etky CD v sade diskov." +msgstr "Zopakujte tento postup pre vÅ¡etky CD v sade diskov." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -263,11 +275,11 @@ msgstr "" "apt-config je jednoduchý nástroj na čítanie konfiguračného súboru APT\n" "\n" "Príkazy:\n" -" shell - Shellový režim\n" +" shell - Režim shell\n" " dump - Zobrazí nastavenie\n" "\n" "Voľby:\n" -" -h Táto nápoveda.\n" +" -h Tento pomocník.\n" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" @@ -292,15 +304,15 @@ msgstr "" "Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n" "\n" "apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n" -"a Å¡ablón z debian balíkov\n" +"a Å¡ablón z balíkov Debian\n" "\n" "Voľby:\n" -" -h Táto nápoveda.\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" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovaÅ¥" @@ -309,31 +321,31 @@ msgstr "Do %s sa nedá zapisovaÅ¥" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiÅ¥ verzia programu debconf. Je debconf nainÅ¡talovaný?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliÅ¡ dlhý" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Chyba pri spracovávaní adresára %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliÅ¡ dlhý" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -388,24 +400,24 @@ msgstr "" "\n" "apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" "Packages okrem vÅ¡etkých riadiacich polí každého balíka obsahuje tiež jeho\n" -"veľkosÅ¥ a MD5 súčet. Podporovaný je tiež súbor 'override', pomocou ktorého\n" +"veľkosÅ¥ a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n" "môžete vynútiÅ¥ hodnoty polí Priority a Section.\n" "\n" "Podobne vie apt-ftparchive vygenerovaÅ¥ zo stromu súborov .dsc súbory\n" -"Sources. Voľbou --source-override môžete určiÅ¥ zdrojový súbor 'override'.\n" +"Sources. Voľbou --source-override môžete určiÅ¥ zdrojový súbor „override“.\n" "\n" -"Príkazy 'packages' a 'sources' by sa mali spúšťaÅ¥ v koreni stromu.\n" +"Príkazy „packages“ a „sources“ by sa mali spúšťaÅ¥ v koreni stromu.\n" "Binárna_cesta by mala ukazovaÅ¥ na začiatok rekurzívneho hľadania\n" -"a súbor 'override' by mal obsahovaÅ¥ príznaky pre nahradenie. Ak je udaný\n" -"prefix_cesty, pridá sa do polí 'filename'.\n" +"a súbor „override“ by mal obsahovaÅ¥ príznaky pre nahradenie. Ak je udaný\n" +"prefix_cesty, pridá sa do polí „filename“.\n" "Skutočný príklad z archívu Debianu:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Voľby:\n" -" -h Táto nápoveda\n" -" --md5 Vygeneruje kontrolný MD5 súčet\n" -" -s=? Zdrojový súbor 'override'\n" +" -h Tento pomocník\n" +" --md5 Vygeneruje kontrolný súčet MD5\n" +" -s=? Zdrojový súbor „override“\n" " -q Tichý režim\n" " -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" " --no-delink Povolí ladiaci režim\n" @@ -413,26 +425,26 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "V balíkovom súbore skupiny `%s' chýbajú niektoré súbory" +msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je naruÅ¡ená, súbor je premenovaný na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -440,278 +452,278 @@ msgstr "" "Formát DB je neplatný. Ak ste aktualizovali starÅ¡iu verziu apt, musíte " "odstrániÅ¥ a znovu vytvoriÅ¥ databázu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriÅ¥ DB súbor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiÅ¥" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archív nemá riadiaci záznam" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nedá sa získaÅ¥ kurzor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Adresár %s sa nedá čítaÅ¥\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s sa nedá vyhodnotiÅ¥\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Chyby sa týkajú súboru " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Chyba pri zisÅ¥ovaní %s" +msgstr "Chyba pri prklade %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Priechod stromom zlyhal" +msgstr "Prechod stromom zlyhal" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "%s sa nedá otvoriÅ¥" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr "Odlinkovanie %s [%s]\n" +msgstr " Odlinkovanie %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Linka %s sa nedá čítaÅ¥" +msgstr "Nie je možné vykonaÅ¥ readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "%s sa nedá odlinkovaÅ¥" +msgstr "Nie je možné vykonaÅ¥ unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepodarilo sa zlinkovaÅ¥ %s s %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "Archív neobsahuje pole package" +msgstr "Archív neobsahuje pole „package“" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" -msgstr " %s nemá žiadnu položku pre override\n" +msgstr " %s nemá žiadnu položku override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s nemá žiadnu source položku pre override\n" +msgstr " %s nemá žiadnu položku „source override“\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nemá žiadnu binary položku pre override\n" +msgstr " %s nemá žiadnu položku „binary override“\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Vnútorná chyba, nedá sa nájsÅ¥ časÅ¥ %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "%s sa nedá otvoriÅ¥" +msgstr "Nedá sa otvoriÅ¥ %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Skomolený súbor %s, riadok %lu #1" +msgstr "Skomolený „override“ %s riadok %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Skomolený súbor %s, riadok %lu #2" +msgstr "Skomolený „override“ %s riadok %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Skomolený súbor %s, riadok %lu #3" +msgstr "Skomolený „override“ %s riadok %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Nepodarilo sa prečítaÅ¥ override súbor %s" +msgstr "Nepodarilo sa prečítaÅ¥ „override“ súbor %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Neznámy kompresný algoritmus '%s'" +msgstr "Neznámy kompresný algoritmus „%s“" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie medziprocesovej rúry k podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Zlyhalo vytvorenie FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Volanie fork() zlyhalo" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "KomprimovaÅ¥ potomka" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Interná chyba, nepodarilo sa vytvoriÅ¥ %s" +msgstr "Vnútorná chyba, nepodarilo sa vytvoriÅ¥ %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriÅ¥ podproces IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiÅ¥ kompresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ale nainÅ¡talovaný je %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ale inÅ¡talovaÅ¥ sa bude %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ale sa nedá nainÅ¡talovaÅ¥" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ale nie je nainÅ¡talovaný" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ale sa nebude inÅ¡talovaÅ¥" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " alebo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné NOVÉ balíky:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -719,145 +731,145 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu aktualizovaných, %lu nových inÅ¡talovaných, " +msgstr "%lu aktualizovaných, %lu nových nainÅ¡talovaných, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinÅ¡talovaných, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainÅ¡talovaných alebo odstránených.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviÅ¥" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Sada pre aktualizáciu sa nedá minimalizovaÅ¥" +msgstr "Sada na aktualizáciu sa nedá minimalizovaÅ¥" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Na opravu môžete spustiÅ¥ `apt-get -f install'." +msgstr "Opravu môžete spustiÅ¥ pomocu „apt-get -f install“." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiÅ¥ -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiÅ¥ vierohodnosÅ¥!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "NainÅ¡talovaÅ¥ tieto nekontrolované balíky [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiÅ¥ vierohodnosÅ¥ niektorých balíkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poÅ¡kodenými balíkmi!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia OdstrániÅ¥ je vypnutá." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Nedá sa načítaÅ¥ zoznam zdrojov." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosÅ¥... Veľkosti nesúhlasia, poÅ¡lite e-mail na apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB archívov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB archívov.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Po rozbalení sa na disku uvoľní %sB.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiÅ¥ veľkosÅ¥ voľného miesta" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." +msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,31 +877,31 @@ msgid "" " ?] " msgstr "" "Možno sa chystáte vykonaÅ¥ niečo Å¡kodlivé.\n" -"Pre pokračovanie opíšte frázu '%s'\n" +"Ak chcete pokračovaÅ¥, opíšte frázu „%s“\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "PreruÅ¡ené." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovaÅ¥ [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "SÅ¥ahovanie ukončené v režime \"iba stiahnuÅ¥\"" +msgstr "SÅ¥ahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +909,47 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuÅ¥. Skúste spustiÅ¥ apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing a výmena média nie sú momentálne podporované" +msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviÅ¥." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "InÅ¡talácia sa preruÅ¡uje." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainÅ¡talovaný.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainÅ¡talovaný, nedá sa teda odstrániÅ¥\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "Balík %s je virtuálny balík poskytovaný:\n" +msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "[InÅ¡talovaný]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybraÅ¥ jeden na inÅ¡taláciu." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,85 +957,128 @@ msgid "" "is only available from another source\n" msgstr "" "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" -"že balík chýba, bol zruÅ¡ený, alebo je dostupný iba z iného zdroja\n" +"že balík chýba, bol zruÅ¡ený alebo je dostupný iba z iného zdroja\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "AvÅ¡ak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inÅ¡taláciu" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinÅ¡talácia %s, pretože sa nedá stiahnuÅ¥.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovÅ¡ej verzie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Nebolo nájdené vydanie '%s' pre '%s'" +msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Nebola nájdená verzia '%s' pre '%s'" +msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nemajú sa odstraňovaÅ¥ veci, nespustí sa AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované, alebo sa " -"použili starÅ¡ie verzie." +"Nasledovné balíky boli nainÅ¡talované automaticky a už viac nie sú potrebné:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Na ich odstránenie použite „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 "" +"Hmm, zdá sa, že AutoRemover niečo zničil, čo sa naozaj nemalo staÅ¥.\n" +"Prosím, poÅ¡lite hlásenie o chybe balíka 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 "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Vnútorná chyba, AutoRemover niečo pokazil" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nebolo možné nájsÅ¥ úlohu %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" +msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s je nastavený na manuálnu inÅ¡taláciu.\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Na opravu nasledovných môžete spustiÅ¥ `apt-get -f install':" +msgstr "Na opravu nasledovných môžete spustiÅ¥ „apt-get -f install“:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " +"Nesplnené závislosti. Skúste spustiÅ¥ „apt-get -f install“ bez balíkov (alebo " "navrhnite rieÅ¡enie)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1035,171 +1090,157 @@ msgstr "" "požadované balíky eÅ¡te neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1569 -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 "" -"Pretože ste požiadali iba o jednoduchú operáciu, je takmer isté, že\n" -"balík nie je inÅ¡talovateľný a mali by ste zaslaÅ¥ hlásenie o chybe\n" -"(bug report) pre daný balík." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Nasledovné informácie vám možno pomôžu vyrieÅ¡iÅ¥ túto situáciu:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "Vnútorná chyba, problem resolver pokazil veci" +msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsÅ¥ zdrojový balík pre %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" +msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" +msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Skontrolujte, či je nainÅ¡talovaný balík 'dpkg-dev'.\n" +msgstr "Skontrolujte, či je nainÅ¡talovaný balík „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" +msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadaÅ¥ aspoň jeden balík, pre ktorý sa budú overovaÅ¥ závislosti na " "zostavenie" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Nedajú sa získaÅ¥ závislosti pre zostavenie %s" +msgstr "Nedajú sa získaÅ¥ závislosti na zostavenie %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s nemá žiadne závislosti pre zostavenie.\n" +msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosÅ¥ pre %s sa nemôže splniÅ¥, pretože sa nedá nájsÅ¥ balík %s" -#: cmdline/apt-get.cc:2282 +#: 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 závislosÅ¥ pre %s sa nedá splniÅ¥, protože sa nedá nájsÅ¥ verzia balíku %s, " +"%s závislosÅ¥ pre %s sa nedá splniÅ¥, protože sa nedá nájsÅ¥ verzia balíka %s, " "ktorá zodpovedá požiadavke na verziu" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: InÅ¡talovaný balík %s je príliÅ¡ nový" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." +msgstr "Závislosti na zostavenie %s sa nedajú splniÅ¥." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Spracovanie závislostí pre zostavenie zlyhalo" +msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1214,6 +1255,8 @@ msgid "" " 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" @@ -1229,7 +1272,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1244,40 +1287,42 @@ msgstr "" " apt-get [voľby] install|remove balík1 [balík2 ...]\n" " apt-get [voľby] source balík1 [balík2 ...]\n" "\n" -"apt-get je jednoduché rozhranie v príkazovom riadku pre sÅ¥ahovanie\n" +"apt-get je jednoduché rozhranie na príkazovom riadku pre sÅ¥ahovanie\n" "a inÅ¡taláciu balíkov. Najpoužívanejšími príkazmi sú update a install.\n" "\n" "Príkazy:\n" -" update - Získa zoznam nových balíkov\n" +" update - Získa nové zoznamy balíkov\n" " upgrade - Vykoná aktualizáciu\n" " install - NainÅ¡taluje nové balíky (balík je libc6, nie libc6." "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" " source - Stiahne zdrojové archívy\n" -" build-dep - Nastaví závislosti pre zostavenie pre zdrojové balíky\n" +" build-dep - Nastaví závislosti kompilácie pre zdrojové balíky\n" " dist-upgrade - Aktualizácia distribúcie, viď apt-get(8)\n" " dselect-upgrade - Riadi sa podľa výberu v dselect-e\n" " clean - Zmaže stiahnuté archívy\n" " autoclean - Zmaže staré stiahnuté archívy\n" -" check - Overí, či nejestvujú poÅ¡kodené závislosti\n" +" check - Overí, či neexistujú poÅ¡kodené závislosti\n" "\n" "Voľby:\n" -" -h Táto nápoveda\n" +" -h Tento pomocník\n" " -q Nezobrazí indikátor priebehu - pre záznam\n" " -qq Zobrazí iba chyby\n" " -d Iba stiahne - neinÅ¡taluje ani nerozbaľuje archívy\n" -" -s Iba napodobňuje prevádzané akcie\n" +" -s Žiadna akcia. Iba simuluje postupnosÅ¥ pripravených akcií\n" " -y Na vÅ¡etky otázky odpovedá Áno\n" -" -f Skúsi pokračovaÅ¥, aj keď zlyhá kontrola integrity\n" +" -f Pokúsi sa opraviÅ¥ systém s poÅ¡kodenými závislosÅ¥ami\n" " -m Skúsi pokračovaÅ¥, aj keď sa nepodarí nájsÅ¥ archívy\n" " -u Zobrazí tiež zoznam aktualizovaných balíkov\n" " -b Po stiahnutí zdrojového balíka ho aj skompiluje\n" " -V Zobrazí čísla verzií\n" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -"Viac volieb nájdete v manuálových stránkách apt-get(8), sources.list(5)\n" +"Viac volieb nájdete v manuálových stránkach apt-get(8), sources.list(5)\n" "a apt.conf(5).\n" -" Toto APT má schopnosti posvätnej kravy.\n" +" Tento APT má schopnosti posvätnej kravy.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1303,7 +1348,7 @@ msgstr "%sB sa stiahlo za %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Spracúva sa]" +msgstr " [Prebieha spracovanie]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1312,9 +1357,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Výmena média: Vložte disk nazvaný\n" -" '%s'\n" -"do mechaniky '%s' a stlačte Enter\n" +"Výmena nosiča: Vložte disk s názvom\n" +" „%s“\n" +"do mechaniky „%s“ a stlačte Enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1339,7 +1384,7 @@ msgstr "" "Voľbou -s si zvolíte typ súboru.\n" "\n" "Voľby:\n" -" -h Táto nápoveda\n" +" -h Tento pomocník\n" " -s Zotriedi zdrojový súbor\n" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" @@ -1348,24 +1393,28 @@ msgstr "" msgid "Bad default setting!" msgstr "Chybné predvolené nastavenie!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Stlačte Enter, ak chcete pokračovaÅ¥." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Chcete odstrániÅ¥ vÅ¡etky doteraz stiahnuté .deb súbory?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Pri rozbaľovaní doÅ¡lo k nejakým chybám. Teraz sa nastavia" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "balíky, ktoré sa nainÅ¡talovali. Môže to spôsobiÅ¥ chybové správy" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "o nesplnených závislostiach. Je to v poriadku, dôležité sú iba" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1375,269 +1424,269 @@ msgstr "" msgid "Merging available information" msgstr "Zlučujú sa dostupné informácie" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "PoruÅ¡ený archív" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolný súčet pre tar zlyhal, archív je poÅ¡kodený" -#: apt-inst/contrib/extracttar.cc:299 +#: 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" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Neplatný podpis archívu" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Chyba pri čítaní záhlavia prvku archívu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Neplatné záhlavie prvku archívu" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archív je príliÅ¡ krátky" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Chyba pri čítaní hlavičiek archívu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hashovací prvok sa nedá nájsÅ¥!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nedá sa alokovaÅ¥ diverzia" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnútorná chyba pri AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojité pridanie diverzie %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je príliÅ¡ dlhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s sa rozbaľuje viackrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Adresár %s je divertovaný" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík sa pokúša zapisovaÅ¥ do diverzného cieľa %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Diverzná cesta je príliÅ¡ dlhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresár %s sa nahradí neadresárom" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nedá sa nájsÅ¥ uzol v jeho hashovacej oblasti" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Cesta je príliÅ¡ dlhá" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "PrepísaÅ¥ zodpovedajúci balík bez udania verzie pre %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 sa nedá čítaÅ¥" +msgstr "Nedá sa načítaÅ¥ %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "%s sa nedá vyhodnotiÅ¥" +msgstr "Nedá sa vyhodnotiÅ¥ %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Odstránenie %s zlyhalo" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "%s sa nedá vytvoriÅ¥" +msgstr "Nedá sa vytvoriÅ¥ %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Vyhodnotenie %sinfo zlyhalo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáre info a temp musia byÅ¥ na tom istom súborovom systéme" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Načítavajú sa zoznamy balíkov" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nedá sa zmeniÅ¥ na admin adresár %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Vnútorná chyba pri získavaní názvu balíka" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Načítavam výpis súborov" +msgstr "Načítava sa zoznam súborov" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Otvorenie súboru zoznamov '%sinfo/%s' zlyhalo. Ak nemôžete obnoviÅ¥ tento " -"súbor, vytvorte ho nový prázdny a ihneď znovu nainÅ¡talujte tú istú verziu " +"Otvorenie súboru zoznamov „%sinfo/%s“ zlyhalo. Ak nemôžete obnoviÅ¥ tento " +"súbor, vytvorte nový prázdny a ihneď znovu nainÅ¡talujte tú istú verziu " "balíka!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Vnútorná chyba pri získavaní uzla" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Diverzný súbor je poruÅ¡ený" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Neplatný riadok v diverznom súbore: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovaÅ¥" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Chyba pri hľadaní Balíka: Hlavička, offset %lu" +msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Chyba pri spracovaní MD5. Offset %lu" +msgstr "Chyba pri spracovaní MD5. Pozícia %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Toto nie je platný DEB archív, chýba časÅ¥ '%s'" +msgstr "Toto nie je platný DEB archív, chýba časÅ¥ „%s“" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Toto nie je platný DEB archív, chýba časÅ¥ '%s' alebo '%s'" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Toto nie je platný DEB archív, chýba časÅ¥ „%s“, „%s“ alebo „%s“" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Nedá sa prejsÅ¥ do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Vnútorná chyba, nedá sa nájsÅ¥ člen" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Nedá sa nájsÅ¥ platný riadiaci súbor" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Nespracovateľný riadiaci súbor" @@ -1658,26 +1707,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Chybné CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nedá sa odpojiÅ¥ CD-ROM v %s - možno sa eÅ¡te používa." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk sa nenaÅ¡iel." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Súbor sa nenaÅ¡iel" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Vyhodnotenie zlyhalo" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1706,12 +1754,12 @@ msgstr "Server zamietol naÅ¡e spojenie s chybou: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER zlyhal, server odpovedal: %s" +msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS zlyhal, server odpovedal: %s" +msgstr "Zlyhalo zadanie hesla, server odpovedal: %s" #: methods/ftp.cc:237 msgid "" @@ -1724,12 +1772,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Príkaz '%s' prihlasovacieho skriptu zlyhal, server odpovedal: %s" +msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE zlyhal, server odpovedal: %s" +msgstr "Zlyhalo zadanie typu, server odpovedal: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1739,7 +1787,7 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1751,7 +1799,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "NaruÅ¡enie protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" @@ -1795,7 +1843,7 @@ msgstr "Neznáma rodina adries %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT zlyhal, server odpovedal: %s" +msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@ -1805,14 +1853,14 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijaÅ¥" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problém s hashovaním súboru" +msgstr "Problém s haÅ¡ovaním súboru" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Súbor sa nedá stiahnuÅ¥, server odpovedal '%s'" +msgstr "Súbor sa nedá stiahnuÅ¥, server odpovedal „%s“" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1821,7 +1869,7 @@ msgstr "Uplynula doba dátového socketu" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Prenos dát zlyhal, server odpovedal '%s'" +msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information #: methods/ftp.cc:997 @@ -1832,59 +1880,59 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nedá sa vyvolaÅ¥ " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Pripája sa k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nedá sa vytvoriÅ¥ socket pre %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazaÅ¥ spojenie na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nedá sa pripojiÅ¥ k %s:%s (%s), uplynul čas spojenia" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nedá sa pripojiÅ¥ k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Nedá sa zistiÅ¥ '%s'" +msgstr "Nie je možné preložiÅ¥ „%s“" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Dočasné zlyhanie pri zisÅ¥ovaní '%s'" +msgstr "Dočasné zlyhanie pri preklade „%s“" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Niečo veľmi zlé sa prihodilo pri zisÅ¥ovaní '%s:%s' (%i)" +msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nedá sa pripojiÅ¥ k %s %s:" @@ -1892,37 +1940,37 @@ msgstr "Nedá sa pripojiÅ¥ k %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Zväzok kľúčov '%s' je nedostupný." +msgstr "Zväzok kľúčov „%s“ je nedostupný." -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliÅ¡ dlhý. Ukončuje " "sa." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiÅ¥ odtlačok kľúča?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Bola zistená aspoň jedna nesprávna signatúra." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Nedá sa spustiÅ¥ '%s' na kontrolu signatúry (je nainÅ¡talované gnupg?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "Nedá sa spustiÅ¥ „%s“ na kontrolu signatúry (je nainÅ¡talované gpgv?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Neznáma chyba pri spustení gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Nasledovné signatúry sú neplatné:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1940,428 +1988,453 @@ msgstr "Nedá sa otvoriÅ¥ rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poÅ¡kodenú podporu rozsahov" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Chyba zápisu do súboru" +msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Nepodarilo sa skrátiÅ¥ súbor" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Vnútorná chyba" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Nedá sa vykonaÅ¥ mmap prázdneho súboru" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nedá sa urobiÅ¥ mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nerozpoznaná skratka typu: '%c'" +msgstr "Nerozpoznaná skratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Otvára sa konfiguračný súbor %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Riadok %d je príliÅ¡ dlhý (nanajvýš %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Skomolená značka" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktívy sa dajú vykonaÅ¥ len na najvyÅ¡Å¡ej úrovni" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: PríliÅ¡ mnoho vnorených prepojení (include)" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'" +msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Parameter príkazového riadku '%c' [z %s] je neznámy" +msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Nezrozumiteľný parameter %s v príkazovom riadku" +msgstr "Nezrozumiteľný parameter %s na príkazovom riadku" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Voľba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovaÅ¥ =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie '%s'" +msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Voľba '%s' je príliÅ¡ dlhá" +msgstr "Voľba „%s“ je príliÅ¡ dlhá" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nezrozumiteľný význam %s, skúste true alebo false. " -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operácia %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiÅ¥" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Nedá sa prejsÅ¥ do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Nedá sa vyhodnotiÅ¥ cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Zamykanie pre zámkový súbor %s, ktorý je iba na čítanie, sa nepoužíva" +msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Zámkový súbor %s sa nedá otvoriÅ¥" +msgstr "Súbor zámku %s sa nedá otvoriÅ¥" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Zamykanie pre zámkový súbor %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:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získaÅ¥" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "Súbor %s sa nedá otvoriÅ¥ súbor" +msgstr "Nedá sa otvoriÅ¥ súbor %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "čítanie, stále treba prečítaÅ¥ %lu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále treba zapísaÅ¥ %lu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problém pri zatváraní súboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problém pri odstraňovaní súboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Vyrovnávacia pamäť balíkov je prázdna" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Súbor vyrovnávacej pamäti balíkov je poÅ¡kodený" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Tento APT nepodporuje systém pre správu verzií '%s'" +msgstr "Tento APT nepodporuje systém na správu verzií „%s“" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Odporúča" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrádza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zneplatňuje" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Kazí" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "dôležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "požadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" -msgstr "Å¡tandartný" +msgstr "Å¡tandardný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "voliteľný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Načítavajú sa stavové informácie" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Nie je možné otvoriÅ¥ StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Nie je možné zapísaÅ¥ dočasný StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovaÅ¥ (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovaÅ¥ (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)" +msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliÅ¡ dlhý." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" +msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2372,18 +2445,18 @@ msgstr "" "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete " "naozaj urobiÅ¥, aktivujte možnosÅ¥ APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Indexový typ súboru '%s' nie je podporovaný" +msgstr "Indexový súbor typu „%s“ nie je podporovaný" -#: apt-pkg/algorithms.cc:241 +#: 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 "Je nutné preinÅ¡talovaÅ¥ balík %s, ale nemôžem pre neho nájsÅ¥ archív." +msgstr "Je nutné preinÅ¡talovaÅ¥ balík %s, ale nedá sa nájsÅ¥ jeho archív." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2391,183 +2464,207 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviÅ¥, niektoré balíky držíte v poÅ¡kodenom stave." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované alebo sa " +"použili starÅ¡ie verzie." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "SÅ¥ahuje sa %li. súbor z %li (zostáva %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "SÅ¥ahuje sa %li. súbor z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Nedá sa nájsÅ¥ ovládač spôsobu %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter." +msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Balíčkovací systém '%s' nie je podporovaný" +msgstr "Systém balíkov „%s“ nie je podporovaný" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Nedá sa určiÅ¥ vhodný typ balíčkovacieho systému" +msgstr "Nedá sa určiÅ¥ vhodný typ systému balíkov" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Nedá sa vyhodnotiÅ¥ %s." +msgstr "Nie je možné vykonaÅ¥ stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Do sources.list musíte zadaÅ¥ nejaké 'zdrojové' URI" +msgstr "Do sources.list musíte zadaÅ¥ nejaký „source“ (zdrojový) URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovaÅ¥ alebo otvoriÅ¥." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiÅ¥ spustiÅ¥ apt-get update" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Neplatný záznam v súbore preferencií, žiadne záhlavie balíka" +msgstr "Neplatný záznam v súbore „preferences“, žiadne záhlavie balíka" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Nezrozumiteľné pripevnenie typu %s" +msgstr "Nezrozumiteľné pridržanie typu %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita" +msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Chyba pri spracovávaní %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Chyba pri spracovávaní %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Chyba pri spracovávaní %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Chyba pri spracovávaní %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Chyba pri spracovávaní %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Chyba pri spracovávaní %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Chyba pri spracovávaní %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Chyba pri spracovávaní %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Vyskytla sa chyba pri spracovávaní %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovaÅ¥." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovaÅ¥." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovaÅ¥." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovaÅ¥." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovávaní %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Chyba pri spracovávaní %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiÅ¥ zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" +msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "Nezhoda MD5 súčtov" +msgstr "Nezhoda kontrolných MD5 súčtov" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Nezhoda kontrolných haÅ¡ súčtov" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2576,7 +2673,7 @@ msgstr "" "Nedá sa nájsÅ¥ súbor s balíkom %s. To by mohlo znamenaÅ¥, že tento balík je " "potrebné opraviÅ¥ manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2585,13 +2682,13 @@ msgstr "" "Nedá sa nájsÅ¥ súbor s balíkom %s. Asi budete musieÅ¥ opraviÅ¥ tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú naruÅ¡ené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2600,7 +2697,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2609,150 +2706,193 @@ msgstr "" "Použije sa CD-ROM prípojný bod %s\n" "Pripája sa CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identifikuje sa.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM sa odpája...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Použije sa CD-ROM prípojný bod %s\n" +msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -"Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n" +"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " +"prekladov a %zu signatúr\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Nájdená menovka: „%s“\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" "Názov tohto disku je: \n" -"'%s'\n" +"„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM sa odpája..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "InÅ¡taluje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Nastavuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Odstraňuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Vykonáva sa spúšťač post-installation %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Adresár „%s“ chýba" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Nastavuje sa %s" +msgid "Processing triggers for %s" +msgstr "Spracovávajú sa spúšťače %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "NainÅ¡talovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Odstraňuje sa %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "Balík '%s' je úplne odstránený" +msgstr "Balík „%s“ je úplne odstránený" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Nedá sa zapísaÅ¥ záznam, volanie openpty() zlyhalo (/dev/pts nie je " +"pripojený?)\n" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Súbor %s sa nedá otvoriÅ¥ súbor" +msgstr "Nedá sa upraviÅ¥ súbor" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" -#~ msgid "File date has changed %s" -#~ msgstr "Dátum súboru sa zmenil %s" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Dynamickému MMap doÅ¡lo miesto" + +#~ 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 "" +#~ "Pretože ste požiadali iba o jednoduchú operáciu, je takmer isté, že\n" +#~ "balík nie je inÅ¡talovateľný a mali by ste zaslaÅ¥ hlásenie o chybe\n" +#~ "(bug report) pre daný balík." diff --git a/po/sl.po b/po/sl.po index 99b7e4b..2ae8270 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" @@ -12,145 +12,156 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s razlièica %s ima nere¹ene odvisnosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Ne najdem paketa %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Vseh imen paketov:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Navadni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Èisti navidezni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Posamezni navidezni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Me¹ani navidezni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manjka: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Vseh razlièic:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Vseh razlièic:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Vseh odvisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Vseh povezava Raz/Dat:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Vseh povezava Raz/Dat:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Vseh dobljenih preslikav: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Vseh raz¹irjenih nizov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celotna velikost z odvisnostmi: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celotna ohlapna velikost: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celotna velikost, izraèunana za: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Paketna datoteka %s ni usklajena." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Podati morate natanèno en vzorec" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nobena datoteka ni bila najdena" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Paketne datoteke:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogoè" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ni najden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Name¹èen: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(brez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Zaponka paketa:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela razlièic:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -173,8 +184,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -210,7 +221,7 @@ msgstr "" " depends - Prika¾e grobe informacije o odvisnostih paketa\n" " rdepends - Prika¾e informacije o odvisnostih paketa za nazaj\n" " pkgnames - Prika¾e seznam vsem paketov\n" -" dotty - Ustvari grafe paketov za GraphVis\n" +" dotty - Ustvari grafe paketov za GraphViz\n" " xvcg - Ustvari grafe paketov za xvcg\n" " policy - Prika¾e politiko nastavitev\n" "\n" @@ -301,7 +312,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoèe pisati na %s" @@ -310,31 +321,31 @@ msgstr "Ni mogo msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoèe ugotoviti razlièice debconfa. Je sploh name¹èen?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Seznam raz¹iritev paketov je predolg" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Napaka pri obdelavi imenika %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Seznam raz¹iritev virov je predolg" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Napaka pri pisanju glave v vsebinsko datoteko" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Napaka pri obdelavi vsebine %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -415,303 +426,303 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno mo¾nost" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ZP je stara, posku¹am nadgraditi %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoèe odprti datoteke ZP %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ni mogoèe najti kazalca" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoèe brati imenika %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoèe nastaviti %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "O: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoèe razre¹iti %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Hoja drevesa ni uspela" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Ni mogoèe odprti %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVe¾i %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Napaka pri branju povezave %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka pri povezovanju %s z %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Dose¾ena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdr¾evalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Notranja napaka. Ni mogoèe najti èlana %s." -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka pri dodeljevanju prostora" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ne morem odpreti %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Napaèno prekrivanje %s vrstica %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Napaèno prekrivanje %s vrstica %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Napaèno prekrivanje %s vrstica %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Napaka pri branju prekrite datoteke %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznan algoritem stiskanja '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje pipe IPC podprocesa ni uspelo" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Vejitev ni uspela" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Otrok stiskanja" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoèe ustvariti %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Ni mogoèe ustvariti podprocesa IPD" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Ni mogoèe izvesti stiskanja" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "program za dekompresijo" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "IO podprocesa/datoteke je spodletel" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Med raèunanjem MD5 ni mogoèe brati" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoèe preimenovati %s v %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nere¹ene odvisnosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s name¹èen" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s name¹èen" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "vendar ni name¹èen" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "vendar ne bo name¹èen" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " ali" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo name¹èeni:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadr¾ani:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:550 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -720,144 +731,144 @@ msgstr "" "OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n" "To NI priporoèljivo, razen èe natanèno veste, kaj poènete." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo name¹èenih, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Ni mogoèe popraviti odvisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Pri¹lo je do te¾av in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Seznama virov ni mogoèe brati." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -868,28 +879,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Ali ¾elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Ni mogoèe dobiti %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +908,47 @@ msgstr "" "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Ni mogoèe popraviti manjkajoèih paketov." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni name¹èen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Name¹èeno]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga ¾elite namestiti." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,75 +959,117 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoèe najti" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razlièice '%s' za '%s' ni mogoèe najti" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razlièica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoèe zakleniti" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Naslednji NOVI paketi bodo name¹èeni:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " -"uporabljena starej¹a." -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Notranja napaka zaradi AllUpgrade." + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Ni mogoèe najti paketa %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "vendar bo paket %s name¹èen" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1024,7 +1077,7 @@ msgstr "" "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1035,140 +1088,126 @@ msgstr "" "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe." -#: cmdline/apt-get.cc:1569 -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 "" -"Ker ste zahtevali samo eno opravilo, je zelo verjetno, da se paketa\n" -"preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" -"o tem paketu." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1177,31 +1216,32 @@ msgstr "" "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne " "more zadostiti zahtevi po razlièici" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1216,6 +1256,8 @@ msgid "" " 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" @@ -1231,7 +1273,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1351,26 +1393,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Napaèna privzeta nastavitev!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Za nadaljevanje pritisnite enter." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Med odpakiranjem je pri¹lo do napak. Nastavil bom" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "pakete, ki so bili name¹èeni. To lahko privede do dvojnih napak" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "ali do napak zaradi manjkajoèih odvisnosti. To je v redu, pomembne so samo " "napake" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "nad tem sporoèilom. Popravite jih in po¾enite Namest[I]tev ¹e enkrat" @@ -1379,188 +1425,188 @@ msgstr "nad tem sporo msgid "Merging available information" msgstr "Spajanje informacij na voljo" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Ni mogoèe ustvariti pip" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Ni mogoèe izvesti gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznan tip glave TAR %u, èlan %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Napaèen podpis arhiva" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Napaka pri branju glave èlana arhiva" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Napaèna glava èlana arhiva" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiv je prekratek" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Glav arhiva ni mogoèe brati" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode je poklical stabilno povezano vozli¹èe" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Ni mogoèe najti razpr¹enega elementa!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Ni mogoèe dodeliti odklona" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Notranja napaka v AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Posku¹am prepisati odklon, %s -> %s in %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojni se¹tevek odklona %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Napaka pri zapiranju datoteke %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Pot %s je predolga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Odpakiranje %s veè kot enkrat" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Imenik %s je odklonjen" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paket posku¹a pisati v tarèo odklona %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Pot odklona je predloga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Imenik %s je bil zamenjan z ne-imenikom" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Iskanje vozli¹èa v njegovem razpr¹enem vedru ni uspelo" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Pot je predolga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepi¹i zadetek paketa brez vnosa razlièice za %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Ni mogoèe brati %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni mogoèe doloèiti %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Odstranitev %s ni uspela" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ni mogoèe ustvariti %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Doloèitev %sinfo ni uspela" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Branje seznama paketov" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Premik v skrbnikov imenik %sinfo ni uspel" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Notranja napaka pri sprejemanju imena paketa" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Branje seznama datotek" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1570,77 +1616,77 @@ msgstr "" "Odpiranje datoteke s seznamom '%sinfo/%s' ni uspelo. Èe ne morete povrniti " "datoteke, jo izpraznite in takoj ponovno namestite enako razlièico paketa!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Notranja napaka pri sprejemanju vozli¹èa" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Datoteka z odklonom je pokvarjena" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Napaèna vrstica v datoteki z odklonom: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Notranja napaka pri dodajanju odklona" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Najprej se mora izvesti predpomnilnik paketov" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Napaka pri iskanju paketa: glava, odmik %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Napaèna izbira ConfFile v datoteki stanja. Odmik %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Napaka pri razèlenjevanju MD5. Odmik %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "To ni veljaven arhiv DEB. Manjka èlan '%s'." -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "To ni veljaven arhiv DEB. Manjka èlan '%s' ali '%s'." -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Ni mogoèe spremeniti v %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Notranja napaka. Ni mogoèe najti èlana." -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Ni mogoèe najti veljavne nadzorne datoteka" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Nadzorne datoteke ni mogoèe razèleniti" @@ -1661,27 +1707,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Napaèen C" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ni mogoèe odklopiti CD-ROM-a v %s, ker je morda ¹e v uporabi." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Datoteke ni mogoèe najti" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteke ni mogoèe najti" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Doloèitev ni uspela" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nastavitev èasa spremembe ni uspela" @@ -1743,7 +1788,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Stre¾nik je zaprl povezavo" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1755,7 +1800,7 @@ msgstr "Odgovor je prekora msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -1809,7 +1854,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoèe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Te¾ava pri razpr¹evanju datoteke" @@ -1836,59 +1881,59 @@ msgstr "Poizvedba" msgid "Unable to invoke " msgstr "Ni mogoèe zagnati " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Povezovanje z %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ni mogoèe ustvariti vtiènice za %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni mogoèe zaèeti povezave z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoèe povezati z %s:%s (%s). Povezava potekla." -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ni se mogoèe povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoèe razre¹iti '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Zaèasna napaka pri razre¹evanju '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Pri¹lo je do napake pri razre¹evanju '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Ni se mogoèe povezati z %s %s:" @@ -1898,34 +1943,34 @@ msgstr "Ni se mogo msgid "Couldn't access keyring: '%s'" msgstr "Ni mogoèe razre¹iti '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo name¹èeni:" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1941,428 +1986,455 @@ msgstr "Ni mogo msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Èakanje na glave" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Napaèna vrstica glave" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Èas za povezavo se je iztekel" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika " -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Napaka pri branju s stre¾nika" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Napaka pri pisanju datoteke %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Napaèni podatki glave" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Notranja napaka" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogoè" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoèe narediti mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Izbira %s ni mogoèe najti" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okraj¹ave: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Vrstica %d je predolga (najveè %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se zaène brez imena." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaèka." -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preveè ugnezdenih vkljuèitev." -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuèen od tu." -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Napaka!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Narejeno" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Mo¾nost ukazne vrstice '%c' [iz %s] ni poznana." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Ne razumem mo¾nosti ukazne vrstice %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Mo¾nost ukazne vrstice %s ni boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Mo¾nost %s zahteva argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Mo¾nost %s: Podrobnosti predmeta za nastavitve potrebujejo =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mo¾nost %s zahteva celo¹tevilski argument, ne '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Mo¾nost '%s' je predolga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Pomena %s ni mogoèe razumeti, poskusite pravilno ali napaèno." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Napaèna operacija %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni mogoèe doloèiti priklopne toèke %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Ni mogoèe spremeniti v %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Ni mogoèe doloèiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoèe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoèe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Èakal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razèlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je neprièakovano zakljuèil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, ¹e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pi¹em, ¹e vedno %lu za pisanje, a ni mogoèe" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Te¾ava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Te¾ava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Te¾ava pri usklajevanju datoteke" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Prazen predpomnilnik paketov" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Razlièica datoteke s predpomnilnikom paketov ni ustrezna" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta APT ne podpira sistema razlièic '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Predpomnilnik paketov je bil zgrajen za drugaèno arhitekturo" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Odvisen od" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predodvisnost" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Priporoèa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Priporoèa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "V sporu z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamenja" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarani" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pomembno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "obvezno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "izbirno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Razlièice kandidatov" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Spajanje informacij na voljo" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Ni mogoèe odprti %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Napaka pri pisanju datoteke %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napaèna vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev distribucije)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napaèna vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2373,19 +2445,19 @@ msgstr "" "zanke spora/predodvisnosti. To je ponavadi slabo, toda èe zares ¾elite " "odstranitev, vkljuèite mo¾nost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" -#: apt-pkg/algorithms.cc:241 +#: 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 "" "Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2393,43 +2465,51 @@ msgstr "" "Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda " "povzroèili zadr¾ani paketi." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " +"uporabljena starej¹a." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manjka imenik s seznami %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manjka imenik z arhivi %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Branje seznama datotek" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ni mogoèe najti gonilnika metod %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaèela pravilno" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2437,139 +2517,158 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni mogoèe doloèiti %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "V sources.list morate vstaviti URI-je z viri" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Ni mogoèe odprti ali razèleniti seznama paketov ali datoteke stanja." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Èe ¾elite odpraviti te¾ave, poskusite zagnati apt-get update." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Napaèen zapis v datoteki z nastavitvami. Ni glave paketa" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoèe razumeti vrste zaponke %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloèena ali pa je niè." -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Predpomnilnik ima neustrezen sistem razlièic" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Pri¹lo je do napake pri obdelavi %s (Najdi paket)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Neujemanje vsote MD5" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2578,7 +2677,7 @@ msgstr "" "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket (zaradi manjkajoèega arhiva)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2587,7 +2686,7 @@ msgstr "" "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2595,7 +2694,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2604,7 +2703,7 @@ msgstr "Neujemanje velikosti" msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje podpisa" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2613,47 +2712,59 @@ msgstr "" "Uporabljam CD-ROM priklopno toèko %s\n" "Priklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identificiram.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Shranjena oznaka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Odklapljam CD-ROM..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljam CD-ROM priklopno toèko %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Odklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Èakam na medij...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Priklapljam CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Preverjam medij za datoteke s kazalom..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Shranjena oznaka: %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite ¹e enkrat.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2662,94 +2773,115 @@ msgstr "" "Ta medij se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Pi¹em nov seznam virov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta medij so:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Odklapljam CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisal %i zapisov.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisal %i zapisov z %i manjkajoèimi datotekami.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisal %i zapisov z %i neujemajoèimi datotekami.\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Zapisal %i zapisov z %i manjkajoèimi datotekami in %i neujemajoèimi " "datotekami.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Name¹èen: " + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Povezujem se z %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Odpiram %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Manjka imenik s seznami %spartial." + +#: apt-pkg/deb/dpkgpm.cc:605 #, fuzzy, c-format msgid "Preparing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, fuzzy, c-format -msgid "Configuring %s" -msgstr "Povezujem se z %s" +msgid "Processing triggers for %s" +msgstr "Napaka pri obdelavi imenika %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, fuzzy, c-format msgid "Installed %s" msgstr " Name¹èen: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "" -#: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Odpiram %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, fuzzy, c-format msgid "Removed %s" msgstr "Priporoèa" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" @@ -2759,6 +2891,46 @@ msgstr "Ne morem odpreti datoteke %s" msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#~ 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 "" +#~ "Ker ste zahtevali samo eno opravilo, je zelo verjetno, da se paketa\n" +#~ "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" +#~ "o tem paketu." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Vrstica %d je predolga (najveè %d)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Vrstica %d je predolga (najveè %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Shranjena oznaka: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Izbira ni uspela" + #~ msgid "File date has changed %s" #~ msgstr "Datum datoteke se je spremenil %s" diff --git a/po/sv.po b/po/sv.po index 17f3fe1..605c8da 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,160 +1,169 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages -# Peter Karlsson , 2002-2005. -# Daniel Nylander , 2005. +# Peter Karlsson , 2002-2008. +# Daniel Nylander , 2005-2008. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-08-18 15:45+0100\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-13 00:28+0100\n" "Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paket %s version %s har ett beroende som inte kan tillfredsställas:\n" +msgstr "" +"Paketet %s med versionen %s har ett beroende som inte kan tillfredsställas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Kunde inte lokalisera paket %s" +msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Totalt antal paketnamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normala paket: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Rent virtuella paket: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " Enkelt virtuella paket: " +msgstr " Enstaka virtuella paket: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Blandat virtuella paket: " +msgstr " Blandade virtuella paket: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Saknade: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totalt antal olika versioner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Totalt antal olika beskrivningar: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totalt antal beroenden: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totalt antal version/filrelationer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Totalt antal beskrivning/filrelationer: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "Totalt antal tillhandahållningsmarkeringar: " +msgstr "Totalt antal tillhandahÃ¥llningsmarkeringar: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Totalt antal sökmönstersträngar: " +msgstr "Totalt antal sökmönstersträngar: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Totalt utrymme för versionsberoenden: " +msgstr "Totalt utrymme för versionsberoenden: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totalt bortkastat utrymme: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Totalt utrymme som kan redogöras för: " +msgstr "Totalt utrymme som kan redogöras för: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "Paketfilen %s är inte synkroniserad." +msgstr "Paketfilen %s är inte synkroniserad." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Du måste ange exakt ett mönster" +msgstr "Du mÃ¥ste ange exakt ett mönster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cachen är ur synk, kan inte korsreferera en paketfil" +msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil" -# Prioritet följt av URI -#: cmdline/apt-cache.cc:1470 +# Prioritet följt av URI +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Fastnålade paket:" +msgstr "FastnÃ¥lade paket:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" -msgstr "(ej funnen)" +msgstr "(hittades inte)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Paketnålning: " +msgstr " PaketnÃ¥lning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s för %s %s kompilerad den %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s för %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -192,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 "" -"Användning: apt-cache [flaggor] kommando\n" +"Användning: apt-cache [flaggor] kommando\n" " apt-cache [flaggor] add fil1 [fil2 ...]\n" " apt-cache [flaggor] showpkg paket1 [paket2 ...]\n" " apt-cache [flaggor] showsrc paket1 [paket2 ...]\n" "\n" -"apt-cache är ett lågnivåverktyg för att hantera APTs binära cachefiler\n" -"samt hämta upplysningar från dem.\n" +"apt-cache är ett lÃ¥gnivÃ¥verktyg för att hantera APTs binära cachefiler\n" +"samt hämta upplysningar frÃ¥n dem\n" "\n" "Kommandon:\n" -" add - Lägg till en paketfil till källcachen\n" -" gencaches - Bygg både paket- och källcache\n" -" showpkg - Visa viss allmän information om ett enskilt paket\n" -" showsrc - Visa källkodsposter\n" -" stats - Visa viss grundläggande statistik\n" +" add - Lägg till en paketfil till källcachen\n" +" gencaches - Bygg bÃ¥de paket- och källcache\n" +" showpkg - Visa viss allmän information om ett enskilt paket\n" +" showsrc - Visa källkodsposter\n" +" stats - Visa viss grundläggande statistik\n" " dump - Visa hela filen i koncis form\n" -" dumpavail - Skriv en \"available\"-fil på standard ut\n" -" unmet - Visa otillfredsställbara beroenden\n" -" search - Sök i paketlistan med ett reguljärt uttryck\n" -" show - Visa en läsbar post för paketet\n" -" depends - Visa rå information om beroenden för ett paket\n" -" rdepends - Visa information om omvända beroenden för ett paket\n" -" pkgnames - Visa namnen på alla paket\n" -" dotty - Generera paketgrafer för GraphVis\n" -" xvcg - Generera paketgrafer för xvcg\n" -" policy - Visa policyinställningar\n" +" dumpavail - Skriv en \"available\"-fil pÃ¥ standard ut\n" +" unmet - Visa otillfredsställbara beroenden\n" +" search - Sök i paketlistan med ett reguljärt uttryck\n" +" show - Visa en läsbar post för paketet\n" +" depends - Visa rÃ¥ information om beroenden för ett paket\n" +" rdepends - Visa information om omvända beroenden för ett paket\n" +" pkgnames - Lista namnen pÃ¥ alla paket i systemet\n" +" dotty - Generera paketdiagram för GraphViz\n" +" xvcg - Generera paketdiagram för xvcg\n" +" policy - Visa policyinställningar\n" "\n" "Flaggor:\n" -" -h Denna hjälptext.\n" +" -h Denna hjälptext.\n" " -p=? Paketcachen.\n" -" -s=? Källcachen.\n" -" -q Inaktivera förloppsindikatorn.\n" -" -i Visa endast viktiga beroendeen för \"unmet\"-kommandot.\n" -" -c=? Läs denna inställningsfil.\n" -" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" -"Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" +" -s=? Källcachen.\n" +" -q Inaktivera förloppsindikatorn.\n" +" -i Visa endast viktiga beroenden för \"unmet\"-kommandot.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" +"Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ange ett namn för denna skiva, såsom \"Debian 2.1r1 Disk 1\"" +msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 2.1r1 Disk 1\"" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Mata in skivan i enheten och tryck Enter" +msgstr "Mata in en skiva i enheten och tryck pÃ¥ Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Repetera denna process för resten av CD-skivorna i din uppsättning." +msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Flaggorna gavs inte parvis" +msgstr "Argumenten gavs inte parvis" #: cmdline/apt-config.cc:76 msgid "" @@ -259,23 +268,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-config [flaggor] kommando\n" +"Användning: apt-config [flaggor] kommando\n" "\n" -"apt-config är ett enkelt verktyg för att läsa APTs inställningsfil\n" +"apt-config är ett enkelt verktyg för att läsa APTs konfigurationsfil\n" "\n" "Kommandon:\n" -" shell - Skalläge.\n" -" dump - Visa inställningen.\n" +" shell - Skalläge.\n" +" dump - Visa konfigurationen.\n" "\n" "Flaggor:\n" -" -h Denna hjälptext.\n" -" -c=? Läs denna inställningsfil.\n" -" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" +" -h Denna hjälptext.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s är inte ett giltigt DEB-paket." +msgstr "%s är inte ett giltigt DEB-paket." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -290,51 +299,51 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-extracttemplates fil1 [fil2 ...]\n" +"Användning: apt-extracttemplates fil1 [fil2 ...]\n" "\n" -"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" -"och mallinformation från paket\n" +"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" +"och mallinformation frÃ¥n paket\n" "\n" "Flaggor:\n" -" -h Denna hjälptext.\n" -" -t Ställ in temporärkatalogen.\n" -" -c=? Läs denna inställningsfil.\n" -" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" +" -h Denna hjälptext.\n" +" -t Ställ in temporärkatalogen.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan inte ta reda på debconfs version. Är debconf installerat?" +msgstr "Kan inte ta reda pÃ¥ debconf-version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "Listan över filtillägg för Packages är för lång" +msgstr "Listan över filtillägg för Packages är för lÃ¥ng" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Fel vid behandling av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "Listan över filtillägg för Sources är för lång" +msgstr "Listan över filtillägg för Sources är för lÃ¥ng" -#: ftparchive/apt-ftparchive.cc:371 +#: 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 huvud till innehÃ¥llsfil" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Fel vid behaldning av innehållet %s" +msgstr "Fel vid behandling av innehÃ¥llet %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -375,843 +384,875 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Användning: apt-ftparchive [flaggor] kommando\n" -"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n" -" sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n" -" contents sökväg\n" -" release sökväg\n" +"Användning: apt-ftparchive [flaggor] kommando\n" +"Kommandon: packages binärsökväg [Ã¥sidosättningsfil [sökvägsprefix]]\n" +" sources källsökväg [Ã¥sidosättningsfil [sökvägsprefix]]\n" +" contents sökväg\n" +" release sökväg\n" " generate konfiguration [grupper]\n" " clean konfiguration\n" "\n" -"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n" -"former av generering, allt från helautomatiserat till funktionella\n" -"ersättningar till dpkg-scanpackages och dpkg-scansources\n" +"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder mÃ¥nga\n" +"former av generering, allt frÃ¥n helautomatiserat till funktionella\n" +"ersättningar till dpkg-scanpackages och dpkg-scansources\n" "\n" -"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n" -"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n" -"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n" +"apt-ftparchive skapar Package-filer frÃ¥n ett träd med .deb-filer.\n" +"Packagefilen innehÃ¥ller alla styrfälten frÃ¥n paketen samt MD5-hashvärdet\n" +"och filstorlek. En overrride-fil stöds för att tvinga värden pÃ¥ Priority\n" "och Section.\n" "\n" -"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n" -".dsc-filer. Flaggan --source-override kan användas för att ange en\n" -"override-fil för källkoden.\n" +"PÃ¥ samma sätt skapar apt-ftparchive Sources-filer frÃ¥n ett träd med\n" +".dsc-filer. Flaggan --source-override kan användas för att ange en\n" +"override-fil för källkoden.\n" "\n" -"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n" -"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n" -"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n" -"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n" -"hur programmet kan användas från Debianarkivet:\n" +"Kommandona \"packages\" och \"sources\" bör köras frÃ¥n rotet pÃ¥ trädet.\n" +"Binärsökvägen bör peka pÃ¥ basen pÃ¥ den rekursiva sökningen och\n" +"override-filen bör innehÃ¥lla override-flaggorna de framtvingade flaggorna.\n" +"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel pÃ¥\n" +"hur programmet kan användas frÃ¥n Debianarkivet:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Flaggor:\n" -" -h Denna hjälptext\n" +" -h Denna hjälptext\n" " --md5 Kontrollera generering av MD5\n" -" -s=? Källkods-override-fil\n" +" -s=? Källkods-override-fil\n" " -q Tyst\n" -" -d=? Väljer den valfria cachedatabasen\n" -" --no-delink Aktivera \"delinkning\"-felspårningsläget\n" +" -d=? Väljer den valfria cachedatabasen\n" +" --no-delink Aktivera \"delinkning\"-felsökningsläget\n" " --contents Styr skapande av contents-fil\n" -" -c=? Läs denna konfigurationsfil\n" -" -o=? Ange valfri inställningsflagga" +" -c=? Läs denna konfigurationsfil\n" +" -o=? Ställ in en godtycklig konfigurationsflagga" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Inga val träffades" +msgstr "Inga val träffades" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Några filer saknas i paketfilsgruppen \"%s\"" +msgstr "NÃ¥gra filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB var skadad, filen omdöpt till %s.old" +msgstr "DB var skadad, filen omdöpt till %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB är för gammal, försöker uppgradera %s" +msgstr "DB är gammal, försöker uppgradera %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " -"från en äldre version av apt." +"DB-formatet är ogiltigt. Ta bort och Ã¥terskapa databasen om du uppgraderar " +"frÃ¥n en äldre version av apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Kunde inte öppna DB-filen %s: %s" +msgstr "Kunde inte öppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Misslyckades med att ta status på %s" +msgstr "Misslyckades med att ta status pÃ¥ %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "Kunde inte få tag i någon markör" +msgstr "Kunde inte fÃ¥ tag i nÃ¥gon markör" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "V: Kunde inte läsa katalogen %s\n" +msgstr "V: Kunde inte läsa katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "V: Kunde inte ta status på %s\n" +msgstr "V: Kunde inte ta status pÃ¥ %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "V: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "F: Felen gäller filen " +msgstr "F: Felen gäller filen " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Misslyckades med att slå upp %s" +msgstr "Misslyckades med att slÃ¥ upp %s" # ??? -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Trädvandring misslyckades" +msgstr "Trädvandring misslyckades" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Misslyckades med att öppna %s" +msgstr "Misslyckades med att öppna %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " Avlänka %s [%s]\n" +msgstr " Avlänka %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Misslyckades med att läsa länk %s" +msgstr "Misslyckades med att läsa länken %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Misslyckades med att länka ut %s" +msgstr "Misslyckades med att länka ut %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Misslyckades med att länka %s till %s" +msgstr "*** Misslyckades med att länka %s till %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Avlänkningsgräns på %sB nådd.\n" +msgstr " Avlänkningsgränsen pÃ¥ %sB nÃ¥ddes.\n" -# Fält vid namn "Package" -#: ftparchive/writer.cc:390 +# Fält vid namn "Package" +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "Arkivet har inget package-fält" +msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " ansvarig för %s är %s ej %s\n" +msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s har ingen källåsidosättningspost\n" +msgstr " %s har ingen källÃ¥sidosättningspost\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s har heller ingen binär åsidosättningspost\n" +msgstr " %s har heller ingen binär Ã¥sidosättningspost\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Kunde inte öppna %s" +msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Misslyckades med att läsa åsidosättningsfilen %s" +msgstr "Misslyckades med att läsa Ã¥sidosättningsfilen %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Okänd komprimeringsalgoritm \"%s\"" +msgstr "Okänd komprimeringsalgoritm \"%s\"" # ??? -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Komprimerad utdata %s behöver en komprimeringsuppsättning" +msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Misslyckades med att skapa IPC-rör till underprocess" +msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Misslyckades med att skapa FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Misslyckades med att grena process" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Barnprocess för komprimering" +msgstr "Barnprocess för komprimering" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Misslyckades med att starta packare " +msgstr "Misslyckades med att starta komprimerare " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "uppackare" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "Barnprocessen misslyckades" +msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Misslyckades med att läsa vid beräkning av MD5" +msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Problem med att länka ut %s" +msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Misslyckades med att byta namn på %s till %s" +msgstr "Misslyckades med att byta namn pÃ¥ %s till %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" -msgstr "Fel vid tolkning av reguljärt uttryck - %s" +msgstr "Fel vid kompilering av reguljärt uttryck - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "Följande paket har beroenden som inte kan tillfredsställas:" +msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "men %s är installerat" +msgstr "men %s är installerat" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" -msgstr "men det är ett virtuellt paket" +msgstr "men det är ett virtuellt paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "men det är inte installerat" +msgstr "men det är inte installerat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "Följande NYA paket kommer att installeras:" +msgstr "Följande NYA paket kommer att installeras:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "Följande paket kommer att TAS BORT:" +msgstr "Följande paket kommer att TAS BORT:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "Följande paket har hållits tillbaka:" +msgstr "Följande paket har hÃ¥llits tillbaka:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "Följande paket kommer att uppgraderas:" +msgstr "Följande paket kommer att uppgraderas:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "Följande paket kommer att NEDGRADERAS:" +msgstr "Följande paket kommer att NEDGRADERAS:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "Följande hållna paket kommer att ändras:" +msgstr "Följande tillbakahÃ¥llna paket kommer att ändras:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " -msgstr "%s (på grund av %s) " +msgstr "%s (pÃ¥ grund av %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"VARNING: Följande systemkritiska paket kommer att tas bort\n" -"Detta bör INTE göras såvida du inte vet exakt vad du gör!" +"VARNING: Följande systemkritiska paket kommer att tas bort.\n" +"Detta bör INTE genomföras sÃ¥vida du inte vet exakt vad du gör!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu uppgraderade, %lu nyinstallerade, " +msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "%lu ominstallerade, " +msgstr "%lu att installera om, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "%lu nedgraderade, " +msgstr "%lu att nedgradera, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu att ta bort och %lu ej uppgraderade.\n" +msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ej helt installerade eller borttagna.\n" +msgstr "%lu är inte helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Rättar till beroenden...." +msgstr "Korrigerar beroenden...." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "Kunde inte rätta till beroenden" +msgstr "Kunde inte korrigera beroenden" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "Kunde inte minimera uppgraderingsuppsättningen" +msgstr "Kunde inte minimera uppgraderingsuppsättningen" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" -msgstr " Färdig" +msgstr " Färdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -"Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"." +"Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "Otillfredsställda beroenden. Försök med -f." +msgstr "Otillfredsställda beroenden. Prova med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "VARNING: Följande paket kunde inte autentiseras!" +msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Autentiseringsvarning åsidosatt.\n" +msgstr "Autentiseringsvarning Ã¥sidosatt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "Några av paketen kunde inte autentiseras" +msgstr "NÃ¥gra av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Problem har uppstått och -y användes utan --force-yes" +msgstr "Problem har uppstÃ¥tt och -y användes utan --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" +msgstr "Internt fel. InstallPackages anropades med trasiga paket!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Paket måste tas bort men \"Remove\" är inaktiverat." +msgstr "Paketen mÃ¥ste tas bort men \"Remove\" är inaktiverat." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "Internt fel. Sorteringen färdigställdes inte" +msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Kunde inte låsa hämtningskatalogen." +msgstr "Kunde inte lÃ¥sa hämtningskatalogen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Listan över källor kunde inte läsas." +msgstr "Listan över källor kunde inte läsas." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages." +"Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Behöver hämta %sB/%sB arkiv.\n" +msgstr "Behöver hämta %sB/%sB arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Behöver hämta %sB arkiv.\n" +msgstr "Behöver hämta %sB arkiv.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att användas.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Efter denna Ã¥tgärd kommer ytterligare %sB utrymme användas pÃ¥ disken.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Efter uppackning kommer %sB frigöras på disken.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Efter denna Ã¥tgärd kommer %sB att frigöras pÃ¥ disken.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "Kunde inte läsa av ledigt utrymme i %s" +msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "Du har inte tillräckligt ledigt utrymme i %s" +msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." +msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "Ja, gör som jag säger!" +msgstr "Ja, gör som jag säger!" -#: cmdline/apt-get.cc:868 +#: 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 "" -"Du är på väg att göra något som kan vara skadligt\n" -"Skriv frasen \"%s\" för att fortsätta\n" +"Du är pÃ¥ väg att göra nÃ¥gonting som kan vara skadligt\n" +"Skriv in frasen \"%s\" för att fortsätta\n" " ?] " -# Visas då man svarar nej -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +# Visas dÃ¥ man svarar nej +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "Vill du fortsätta [J/n]? " +msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Misslyckades med att hämta %s %s\n" +msgstr "Misslyckades med att hämta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Misslyckades med att hämta vissa filer" +msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Hämtningen färdig i \"endast-hämta\"-läge" +msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " -"--fix-missing." +"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" +"fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing och mediabyte stöds inte ännu" +msgstr "--fix-missing och mediabyte stöds inte för tillfället" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "Kunde inte rätta till saknade paket." +msgstr "Kunde inte korrigera saknade paket." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Observera, väljer %s istället för %s\n" +msgstr "Observera, väljer %s istället för %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" +"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Paketet %s är inte installerat, så tas inte bort\n" +msgstr "Paketet %s är inte installerat, sÃ¥ det tas inte bort\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" +msgstr "Paketet %s är ett virtuellt paket som tillhandahÃ¥lls av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Du bör explicit ange ett att installera." +msgstr "Du bör uttryckligen ange ett att installera." -#: cmdline/apt-get.cc:1091 +#: 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 "" -"Paketet %s är inte tillgängligt, men ett annat paket hänvisar till det.\n" -"Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n" -"bara är tillgängligt från andra källor\n" +"Paketet %s är inte tillgängligt, men ett annat paket hänvisar till det.\n" +"Det kan betyda att paketet saknas, har blivit förÃ¥ldrat eller endast\n" +"är tillgängligt frÃ¥n andra källor\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "Dock kan följande paket ersätta det:" +msgstr "Dock kan följande paket ersätta det:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" +msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s är redan den senaste versionen.\n" +msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" +msgstr "UtgÃ¥van \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Version \"%s\" för \"%s\" hittades inte" +msgstr "Version \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Vald version %s (%s) för %s\n" +msgstr "Vald version %s (%s) för %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Kunde inte låsa listkatalogen" +msgstr "Kunde inte lÃ¥sa listkatalogen" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Det är inte meningen att vi ska ta bort nÃ¥got, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " -"använts istället." +"Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Använd \"apt-get autoremove\" för att ta bort dem." + +#: 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, det verkar som AutoRemover förstörde nÃ¥got som verkligen\n" +"inte skulle hända. Skicka in en felrapport mot paketet 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 "Följande information kan vara till hjälp för att lösa situationen:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internt fel, AutoRemover förstörde nÃ¥got" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Internt fel, AllUpgrade förstörde något" +msgstr "Internt fel, AllUpgrade förstörde nÃ¥got" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Kunde inte hitta funktionen %s" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Observera, väljer %s för regex \"%s\"\n" +msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s är satt till manuellt installerad.\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -"Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" +"Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " -"(eller ange en lösning)." +"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " +"(eller ange en lösning)." -#: cmdline/apt-get.cc:1561 +#: 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 "" -"Några paket kunde inte installeras. Detta kan betyde att du har\n" -"bett om en omöjlig situation eller, om du använder den instabila\n" -"distributionen, att några krävda paket ännu inte har skapats eller\n" -"lagts in från \"Incoming\"." - -#: cmdline/apt-get.cc:1569 -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 "" -"Eftersom du bad om en enda handling är det mycket troligt att paketet\n" -"helt enkelt inte kan installeras och att en felrapport om detta bör\n" -"skrivas." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Följande information kan vara till hjälp för att lösa situationen:" +"NÃ¥gra paket kunde inte installeras. Det kan betyda att du har begärt\n" +"en omöjlig situation eller, om du använder den instabila utgÃ¥van\n" +"att nÃ¥gra nödvändiga paket ännu inte har skapats eller flyttats\n" +"ut frÃ¥n \"Incoming\"." -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "Följande ytterligare paket kommer att installeras:" +msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "Föreslagna paket:" +msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "Beräknar uppgradering... " +msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" -msgstr "Färdig" +msgstr "Färdig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "Internt fel, problemlösaren bröt sönder saker" +msgstr "Internt fel, problemlösaren förstörde nÃ¥gonting" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "Du måste ange åtminstone ett paket att hämta källkod för" +msgstr "Du mÃ¥ste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "Kunde inte hitta något källkodspaket för %s" +msgstr "Kunde inte hitta nÃ¥got källkodspaket för %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Hoppar över redan hämtad fil \"%s\"\n" +msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "Du har inte tillräckligt ledigt utrymme i %s" +msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" +msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Behöver hämta %sB källkodsarkiv.\n" +msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Hämtar källkod %s\n" +msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Misslyckades med att hämta vissa arkiv." +msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Packar inte upp redan redan uppackad källkod i %s\n" +msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Kontrollera att paketet \"dpkg-dev\" är installerat.\n" +msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" -msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för" +msgstr "Du mÃ¥ste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Kunde inte hämta byggberoendeinformation för %s" +msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" +"%s-beroendet pÃ¥ %s kan inte tillfredsställas eftersom paketet %s inte kan " +"hittas" -#: cmdline/apt-get.cc:2282 +#: 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-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " -"versioner av paketet %s uppfyller versionskraven" +"%s-beroendet pÃ¥ %s kan inte tillfredsställas eftersom inga tillgängliga " +"versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Misslyckades med att uppfylla %s-beroendet för %s: Det installerade paketet %" -"s är för nytt" +"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " +"paketet %s är för nytt" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Misslyckades med att uppfylla %s-beroendet för %s: %s" +msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Byggberoenden för %s kunde inte uppfyllas." +msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "Kunde inte hantera byggberoenden" +msgstr "Misslyckades med att behandla byggberoenden" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" -msgstr "Moduler som stöds:" +msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1226,6 +1267,8 @@ msgid "" " 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" @@ -1241,7 +1284,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1252,61 +1295,63 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Användning: apt-get [flaggor] kommando\n" +"Användning: apt-get [flaggor] kommando\n" " apt-get [flaggor] install|remove paket1 [paket2 ...]\n" " apt-get [flaggor] source paket1 [paket2 ...]\n" "\n" -"apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n" -"paket. De mest använda kommandona är \"update\" och \"install\".\n" +"apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n" +"paket. De mest använda kommandona är \"update\" och \"install\".\n" "\n" "Kommandon:\n" -" update - Hämta nya paketlistor\n" -" upgrade - Utför en uppgradering\n" -" install - Installera nya paket (paket är libc6, inte libc6.deb)\n" +" update - Hämta nya paketlistor\n" +" upgrade - Utför en uppgradering\n" +" install - Installera nya paket (paket är libc6, inte libc6.deb)\n" " remove - Ta bort paket\n" -" source - Hämta källkodsarkiv\n" -" build-dep - Tillfredsställ byggberoenden för källkodspaket\n" +" autoremove - Ta automatiskt bort alla oanvända paket\n" +" purge - Ta bort och helt radera paket\n" +" source - Hämta källkodsarkiv\n" +" build-dep - Tillfredsställ byggberoenden för källkodspaket\n" " dist-upgrade - Uppgradering av distributionen, se apt-get(8)\n" -" dselect-upgrade - Följ valen från dselect\n" -" clean - Ta bort hämtade arkivfiler\n" -" autoclean - Ta bort gamla hämtade arkivfiler\n" -" check - Kontrollera att det inte finns några trasiga beroenden\n" +" dselect-upgrade - Följ valen frÃ¥n dselect\n" +" clean - Ta bort hämtade arkivfiler\n" +" autoclean - Ta bort gamla hämtade arkivfiler\n" +" check - Kontrollera att det inte finns nÃ¥gra trasiga beroenden\n" "\n" "Flaggor:\n" -" -h Denna hjälptext.\n" -" -q Utdata lämplig för loggar - ingen förloppsindikator.\n" -" -qq Ingen utdata förutom vid fel.\n" -" -d Bara hämta - VARKEN installera eller packa upp arkiven.\n" -" -s Gör ingenting, simulera vad som skulle hända.\n" -" -y Antag ja på alla frågor utan att fråga.\n" -" -f Försök fortsätta även om integritetskontroll misslyckas.\n" -" -m Försök fortsätta även om arkiven inte kan hittas.\n" -" -u Visa även en lista över uppgraderade paket.\n" -" -b Bygg källkodspaketet när det hämtats.\n" +" -h Denna hjälptext.\n" +" -q Utdata lämplig för loggar - ingen förloppsindikator.\n" +" -qq Ingen utdata förutom vid fel.\n" +" -d Bara hämta - VARKEN installera eller packa upp arkiven.\n" +" -s Gör ingenting, simulera vad som skulle hända.\n" +" -y Antag ja pÃ¥ alla frÃ¥gor utan att frÃ¥ga.\n" +" -f Försök rätta ett system med otillfredsställda beroenden.\n" +" -m Försök fortsätta även om arkiven inte kan hittas.\n" +" -u Visa även en lista över uppgraderade paket.\n" +" -b Bygg källkodspaketet när det hämtats.\n" " -V Visa pratsamma versionsnummer.\n" -" -c=? Läs denna inställningsfil.\n" -" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" -"Se manualsidorna för apt-get(8), sources.list(5) och apt.conf(5)\n" -"för mer information och flaggor.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" +"Se manualsidorna för apt-get(8), sources.list(5) och apt.conf(5)\n" +"för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -# Måste vara tre bokstäver(?) -# "Hit" = aktuell version är fortfarande giltig +# MÃ¥ste vara tre bokstäver(?) +# "Hit" = aktuell version är fortfarande giltig #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Bra " -# "Get:" = hämtar ny version +# "Get:" = hämtar ny version #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Läs:" +msgstr "Läs:" -# "Ign" = hoppar över +# "Ign" = hoppar över #: cmdline/acqprogress.cc:110 msgid "Ign " msgstr "Ign " -# "Err" = fel vid hämtning +# "Err" = fel vid hämtning #: cmdline/acqprogress.cc:114 msgid "Err " msgstr "Fel " @@ -1314,7 +1359,7 @@ msgstr "Fel " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Hämtade %sB på %s (%sB/s)\n" +msgstr "Hämtade %sB pÃ¥ %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1328,13 +1373,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Mediabyte: Sätt i disken med etiketten\n" +"Mediabyte: Mata in skivan med etiketten\n" " \"%s\"\n" -"i enhet \"%s\" och tryck Enter\n" +"i enheten \"%s\" och tryck pÃ¥ Enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Okänd paketpost!" +msgstr "Okänd paketpost!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1349,362 +1394,363 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n" +"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n" "\n" -"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n" -"-s anges för att ange filens typ.\n" +"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n" +"-s anges för att ange filens typ.\n" "\n" "Flaggor:\n" -" -h Denna hjälptext.\n" -" -s Använd källkodsfilssortering.\n" -" -c=? Läs denna inställningsfil.\n" -" -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" +" -h Denna hjälptext.\n" +" -s Använd källkodsfilssortering.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Ogiltig standardinställning!" +msgstr "Felaktig standardinställning!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Tryck Enter för att fortsätta." +msgstr "Tryck pÃ¥ Enter för att fortsätta." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Vill du ta bort eventuellt tidigare hämtade .deb-filer?" # 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:100 +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Fel uppstod vid uppackning. Jag kommer ställa in de paket som" +msgstr "Det uppstod fel vid uppackning. Jag kommer konfigurera de paket" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" -msgstr "installerades. Detta kan ge dubbla fel eller fel orsakade av" +msgstr "som installerades. Detta kan ge dubbla fel eller fel orsakade av" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "saknade beroenden. Detta är okej, bara felen ovanför detta" +msgstr "saknade beroenden. Detta är okej, endast felen ovanför det här" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "meddelande är viktiga. Försök rätta till dem och [I]nstallera igen" +msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera igen" #: dselect/update:30 msgid "Merging available information" -msgstr "Lägger in tillgänglighetsinformation" +msgstr "Sammanfogar tillgänglig information" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Misslyckades med att skapa rör" +msgstr "Misslyckades med att skapa rör" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Misslyckades med att köra gzip" +msgstr "Misslyckades med att köra gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "Fördärvat arkiv" +msgstr "Skadat arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt" +msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" -#: apt-inst/contrib/extracttar.cc:299 +#: 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-huvudtyp %u, del %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ogiltig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Misslyckades med att läsa huvud för arkivdel" +msgstr "Fel vid läsning av huvud för arkivdel" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelshuvud" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "Arkivet är för kort" +msgstr "Arkivet är för kort" -#: apt-inst/contrib/arfile.cc:135 +#: 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 arkivhuvuden" -# noden har inte någon länk till nästa paket -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode anropat på olänkad nod" +msgstr "DropNode anropat pÃ¥ fortfarande länkad nod" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Misslyckades med att hitta hash-element!" +msgstr "Misslyckades med att hitta hash-elementet!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Misslyckades med att allokera omdirigering" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internt fel i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Försöker skriva över en omdirigering, %s -> %s och %s/%s" +msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Omdirigering %s -> %s inlagd två gånger" +msgstr "Omdirigeringen %s -> %s inlagd tvÃ¥ gÃ¥nger" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Misslyckades med att stänga filen %s" +msgstr "Misslyckades med att stänga filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "Sökvägen %s är för lång" +msgstr "Sökvägen %s är för lÃ¥ng" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Packar upp %s flera gånger" +msgstr "Packar upp %s flera gÃ¥nger" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "Katalogen %s är omdirigerad" +msgstr "Katalogen %s är omdirigerad" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketet försöker skriva till omdirigeringsmålet %s/%s" +msgstr "Paketet försöker att skriva till omdirigeringsmÃ¥let %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Omdirigeringssökvägen är för lång" +msgstr "Omdirigeringssökvägen är för lÃ¥ng" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Katalogen %s ersätts av en icke-katalog" +msgstr "Katalogen %s ersätts av en icke-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Misslyckades med att hitta noden i sin hashkorg" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "Sökvägen är för lång" +msgstr "Sökvägen är för lÃ¥ng" -# ??? -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Skriver över paketträff utan version för %s" +msgstr "Skriv över paketträff utan version för %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Filen %s/%s skriver över den i paketet %s" +msgstr "Filen %s/%s skriver över den i paketet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Kunde inte läsa %s" +msgstr "Kunde inte läsa %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Kunde inte ta status på %s" +msgstr "Kunde inte ta status pÃ¥ %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Misslyckades med att ta bort %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kunde inte skapa %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Kunde inte ta status på %sinfo" +msgstr "Misslyckades att ta status pÃ¥ %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Katalogerna info och temp måste ligga på samma filsystem" +msgstr "Katalogerna info och temp mÃ¥ste vara pÃ¥ samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Läser paketlistor" +msgstr "Läser paketlistor" -# Felmeddelande för misslyckad chdir -#: apt-inst/deb/dpkgdb.cc:180 +# Felmeddelande för misslyckad chdir +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Kunde inte gå till adminkatalogen %sinfo" +msgstr "Misslyckades att växla till adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Internt fel när namn på Package-fil skulle hämtas" +msgstr "Internt fel när namn pÃ¥ Package-fil skulle hämtas" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Läser fillista" +msgstr "Läser fillista" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"Misslyckades med att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa " +"Misslyckades med att öppna listfilen \"%sinfo/%s\". Om du inte kan Ã¥terskapa " "filen, skapa en tom och installera omedelbart om samma version av paketet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Misslyckades med att läsa listfilen %sinfo/%s" +msgstr "Misslyckades med att läsa listfilen %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Internt fel när en nod skulle hämtas" +msgstr "Internt fel när en nod skulle hämtas" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Misslyckades med att öppna omdirigeringsfilen %sdiversions" +msgstr "Misslyckades med att öppna omdirigeringsfilen %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Omdirigeringsfilen är trasig" +msgstr "Omdirigeringsfilen är skadad" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Felaktig rad i omdirigeringsfilen: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Internt fel när en omdirigering skulle läggas till" +msgstr "Internt fel när en omdirigering skulle läggas till" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Paketcachen måste ha initierats först" +msgstr "Paketcachen mÃ¥ste först initieras" -#: apt-inst/deb/dpkgdb.cc:443 +#: 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" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Fel vid tolkning av MD5. Offset %lu" +msgstr "Fel vid tolkning av MD5. Position %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" +msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Detta är inte ett giltigt DEB-arkiv, både \"%s\" och \"%s\" saknas" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Detta är inte ett giltigt DEB-arkiv, \"%s\", \"%s\" och \"%s\" saknas" # chdir -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Kunde inte gå till %s" +msgstr "Kunde inte byta till %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Internt fel, kunde inte hitta del" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Misslyckades med att hitta en giltig control-fil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Kunde inte tolka control-filen" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Kunde inte läsa cd-rom-databasen %s" +msgstr "Kunde inte läsa cd-rom-databasen %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 "" -"Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan " -"inte användas för att lägga till skivor" +"Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan " +"inte användas för att lägga till skivor" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Fel cd" +msgstr "Fel cd-rom" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." +msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Disk ej funnen." +msgstr "Skivan hittades inte." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Filen ej funnen" +msgstr "Filen hittades inte" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Kunde inte ta status" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Misslyckades sätta modifieringstid" +msgstr "Misslyckades ställa in ändringstid" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Ogiltig URI, lokala URI:er får inte starta med //" +msgstr "Ogiltig URI, lokala URI:er fÃ¥r inte börja med //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1713,11 +1759,11 @@ msgstr "Loggar in" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Kunde inte ta reda på namn på partner" +msgstr "Kunde inte fastställa namnet pÃ¥ partnern" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Kunde inte ta reda på eget namn" +msgstr "Kunde inte fastställa det lokala namnet" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format @@ -1740,12 +1786,12 @@ msgid "" "is empty." msgstr "" "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" -"ProxyLogin är tom." +"ProxyLogin är tom." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s" +msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" #: methods/ftp.cc:291 #, c-format @@ -1754,15 +1800,15 @@ msgstr "TYPE misslyckades, servern sade: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Inget svar på förbindelsen inom tidsgränsen" +msgstr "Tidsgränsen för anslutningen överskreds" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Servern stängde anslutningen" +msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" -msgstr "Läsfel" +msgstr "Läsfel" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." @@ -1770,19 +1816,19 @@ msgstr "Ett svar spillde bufferten." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokollet fördärvat" +msgstr "Protokollet skadat" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Kunde inte skapa uttag (socket)" +msgstr "Kunde inte skapa ett uttag (socket)" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Kunde inte ansluta datauttag (socket), inget svar inom tidsgräns" +msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1790,28 +1836,28 @@ msgstr "Kunde inte ansluta passivt uttag (socket)." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)" +msgstr "getaddrinfo kunde inte fÃ¥ tag i ett lyssnande uttag (socket)" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Kunde inte binda uttag (socket)" +msgstr "Kunde inte binda ett uttag (socket)" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Kunde inte lyssna på uttaget (socket)" +msgstr "Kunde inte lyssna pÃ¥ uttaget (socket)" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Kunde inte avgöra uttagets namn (socket)" +msgstr "Kunde inte fastställa uttagets namn (socket)" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "Kunde inte sända PORT-kommando" +msgstr "Kunde inte sända PORT-kommando" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Okänd adressfamilj %u (AF_*)" +msgstr "Okänd adressfamilj %u (AF_*)" #: methods/ftp.cc:798 #, c-format @@ -1820,96 +1866,96 @@ msgstr "EPRT misslyckades, servern sade: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgräns" +msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "Kunde inte ta emot anslutning" +msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problem med att lägga filen till hashtabellen" +msgstr "Problem med att lägga filen till hashtabellen" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Kunde inte hämta filen, servern sade \"%s\"" +msgstr "Kunde inte hämta filen, servern sade \"%s\"" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datauttag (socket) fick inte svar inom tidsgräns" +msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Dataöverföring misslyckades, servern sade \"%s\"" +msgstr "Dataöverföringen misslyckades, servern sade \"%s\"" -# Statusmeddelande, byter från substantiv till verb +# Statusmeddelande, byter frÃ¥n substantiv till verb #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Frågar" +msgstr "FrÃ¥gar" #: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Kunde inte starta " -# Felmeddelande för misslyckad chdir -#: methods/connect.cc:64 +# Felmeddelande för misslyckad chdir +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Kunde inte skapa uttag (socket) för %s (f=%u t=%u p=%u)" +msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Kunde inte påbörja anslutning till %s:%s (%s)." +msgstr "Kunde inte initiera anslutningen till %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Kunde inte ansluta till %s:%s (%s), tog för lång tid" +msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Kunde inte slå upp \"%s\"" +msgstr "Kunde inte slÃ¥ upp \"%s\"" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Temporärt fel vid uppslagning av \"%s\"" +msgstr "Temporärt fel vid uppslagning av \"%s\"" -# Okänd felkod; %i = koden -#: methods/connect.cc:176 +# Okänd felkod; %i = koden +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Något otäckt hände när \"%s:%s\" slogs upp (%i)" +msgstr "NÃ¥got konstigt hände när \"%s:%s\" slogs upp (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" @@ -1917,772 +1963,838 @@ msgstr "Kunde inte ansluta till %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Kunde inte komma åt nyckelring: \"%s\"" +msgstr "Kunde inte komma Ã¥t nyckelring: \"%s\"" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." +msgstr "E: Argumentslistan frÃ¥n Acquire::gpgv::Options är för lÃ¥ng. Avslutar." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" +"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " +"fingeravtryck?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Åtminstone en giltig signatur träffades på." +msgstr "Minst en ogiltig signatur träffades pÃ¥." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)" +"Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "Okänt fel vid exekvering av gpgv" +msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "Följande signaturer är ogiltiga:\n" +msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Följande signaturer kunde inte verifieras för att den publika nyckeln inte " -"är tillgänglig:\n" +"Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " +"tillgänglig:\n" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Kunde inte öppna rör för %s" +msgstr "Kunde inte öppna rör för %s" # %s = programnamn #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "Läsfel på %s-processen" +msgstr "Läsfel frÃ¥n %s-processen" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Väntar på huvuden" +msgstr "Väntar pÃ¥ huvuden" -#: methods/http.cc:521 +#: 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 huvudrad pÃ¥ %u tecken" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" -msgstr "Trasig huvudrad" +msgstr "Felaktig huvudrad" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "Http-servern sände ett ogiltigt svarshuvud" +msgstr "Http-servern sände ett ogiltigt svarshuvud" -#: methods/http.cc:584 +#: 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-huvud" -#: methods/http.cc:599 +#: 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-huvud" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Denna http-servers stöd för delvis hämtning fungerar inte" +msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" -msgstr "Okänt datumformat" +msgstr "Okänt datumformat" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" -msgstr "Tidsgränsen för anslutningen nåddes" +msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" +msgstr "Fel vid läsning frÃ¥n server: Andra änden stängde förbindelsen" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "Fel vid läsning från server" +msgstr "Fel vid läsning frÃ¥n server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Misslyckades med att kapa av filen" + +#: methods/http.cc:1105 msgid "Bad header data" -msgstr "Trasigt data i huvud" +msgstr "Felaktiga data i huvud" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Anslutning misslyckades" +msgstr "Anslutningen misslyckades" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Internt fel" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "Kan inte utföra mmap på en tom fil" +msgstr "Kan inte utföra mmap pÃ¥ en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Kunde inte utföra mmap på %lu byte" +msgstr "Kunde inte utföra mmap pÃ¥ %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "Valet %s ej funnet" +msgstr "Valet %s hittades inte" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Okänd typförkortning: \"%c\"" +msgstr "Okänd typförkortning: \"%c\"" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "Öppnar konfigurationsfil %s" - -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Rad %d för lång (max %d)" +msgstr "Öppnar konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Syntaxfel %s:%u: Block börjar utan namn." +msgstr "Syntaxfel %s:%u: Block börjar utan namn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaxfel %s:%u: Felformat märke" +msgstr "Syntaxfel %s:%u: Felformat märke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" +msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" +msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras pÃ¥ toppnivÃ¥n" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" +msgstr "Syntaxfel %s:%u: För mÃ¥nga nästlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaxfel %s:%u: Inkluderad härifrån" +msgstr "Syntaxfel %s:%u: Inkluderad härifrÃ¥n" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds ej" +msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" +msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fel!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Färdig" +msgstr "%c%s... Färdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Kommandoradsflagga \"%c\" [från %s] är ej känd." +msgstr "Kommandoradsflaggan \"%c\" [frÃ¥n %s] är inte känd." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Förstår inte kommandoradsflaggan %s" +msgstr "FörstÃ¥r inte kommandoradsflaggan %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Kommandoradsflaggan %s är inte boolsk" +msgstr "Kommandoradsflaggan %s är inte boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "Flaggan %s kräver ett värde." +msgstr "Flaggan %s kräver ett argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Flagga %s: Den angivna konfigurationsposten måste innehålla =." +msgstr "" +"Flaggan %s: Den angivna konfigurationsposten mÃ¥ste innehÃ¥lla ett =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Flaggan %s kräver ett heltalsvärde, inte \"%s\"" +msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Flaggan \"%s\" är för lång" +msgstr "Flaggan \"%s\" är för lÃ¥ng" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Förstår ej %s, försök med \"true\" eller \"false\"." +msgstr "FörstÃ¥r inte %s, prova med \"true\" eller \"false\"." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "Felaktig operation %s" +msgstr "Felaktig Ã¥tgärd %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Kunde inte ta status på monteringspunkt %s." +msgstr "Kunde inte ta status pÃ¥ monteringspunkten %s." -# Felmeddelande för misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +# Felmeddelande för misslyckad chdir +#: 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 "Kunde inte gå till %s" +msgstr "Kunde inte byta till %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Kunde inte ta status på cd-romen." +msgstr "Kunde inte ta status pÃ¥ cd-romen." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Använder inte låsning för skrivskyddad låsfil %s" +msgstr "Använder inte lÃ¥sning för skrivskyddade lÃ¥sfilen %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Kunde inte öppna låsfilen %s" +msgstr "Kunde inte öppna lÃ¥sfilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Använder inte låsning för nfs-monterad låsfil %s" +msgstr "Använder inte lÃ¥sning för nfs-monterade lÃ¥sfilen %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "Kunde inte erhålla låset %s" +msgstr "Kunde inte erhÃ¥lla lÃ¥set %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Väntade, på %s men den fanns inte där" +msgstr "Väntade pÃ¥ %s men den fanns inte där" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." +msgstr "Underprocessen %s rÃ¥kade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Underprocessen %s returnerade en felkod (%u)" +msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Underprocessen %s avslutade oväntat" +msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "Kunde inte öppna filen %s" +msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "läsning, har fortfarande %lu att läsa men inget är kvar" +msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "skrivning, har fortfarande %lu att skriva men kunde ej" +msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "Problem med att stänga filens" +msgstr "Problem med att stänga filen" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Problem med att länka ut filen" +msgstr "Problem med att länka ut filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "Problem med att synka filen" +msgstr "Problem med att synkronisera filen" # Felmeddelande -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Paketcachen är tom" +msgstr "Paketcachen är tom" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Paketcachefilen är trasig" +msgstr "Paketcachefilen är skadad" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Paketcachefilens version är inkompatibel" +msgstr "Paketcachefilens version är inkompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Denna APT stöder inte versionssystemet \"%s\"" +msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Paketcachen byggdes för en annan arkitektur" +msgstr "Paketcachen byggdes för en annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "Beror" +msgstr "Beroende av" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Beror i förväg" +msgstr "Förberoende av" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" -msgstr "Föreslår" +msgstr "FöreslÃ¥r" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekommenderar" # "Konfliktar"? -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" -msgstr "I konflikt med" +msgstr "StÃ¥r i konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" -msgstr "Ersätter" +msgstr "Ersätter" -# "Föråldrar"? -#: apt-pkg/pkgcache.cc:220 +# "FörÃ¥ldrar"? +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "Gör föråldrad" +msgstr "FörÃ¥ldrar" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Trasar sönder" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktigt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" -msgstr "krävt" +msgstr "nödvändigt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "normalt" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Bygger beroendeträd" +msgstr "Bygger beroendeträd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Läser tillstÃ¥ndsinformation" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Misslyckades med att öppna StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Misslyckades med att skriva temporär StateFile %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Rad %lu i källistan %s har fel format (URI)" +msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Rad %lu i källistan %s har fel format (dist)" +msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" +msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" +msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" +msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "Öppnar %s" +msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "Rad %u för lång i källistan %s." +msgstr "Rad %u är för lÃ¥ng i källistan %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Rad %u i källistan %s har fel format (typ)" +msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ \"%s\" är okänd på rad %u i listan över källor %s" +msgstr "Typ \"%s\" är inte känd pÃ¥ rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" +msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" -#: apt-pkg/packagemanager.cc:402 +#: 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 "" -"För att genomföra denna installation måste det systemkritiska paketet %s " -"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " -"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " +"För att genomföra installationen mÃ¥ste det systemkritiska paketet %s " +"tillfälligt tas bort pÃ¥ grund av en beroendespiral i Conflicts/Pre-Depends. " +"Detta är oftast en dÃ¥lig idé, men om du verkligen vill göra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Indexfiler av typ \"%s\" stöds inte" +msgstr "Indexfiler av typ \"%s\" stöds inte" -#: apt-pkg/algorithms.cc:241 +#: 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 "" -"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." +"Paketet %s mÃ¥ste installeras om, men jag kan inte hitta nÃ¥got arkiv för det." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " -"hållna paket." +"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero pÃ¥ " +"tillbakahÃ¥llna paket." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket." +msgstr "Kunde inte korrigera problemen, du har hÃ¥llt tillbaka trasiga paket." + +#: 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 "" +"Vissa indexfiler kunde inte hämtas, de har ignorerats eller sÃ¥ har de gamla " +"använts istället." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Hämtar fil %li av %li (%s återstår)" +msgstr "Hämtar fil %li av %li (%s Ã¥terstÃ¥r)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "Hämtar fil %li av %li" +msgstr "Hämtar fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." +msgstr "" +"Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck pÃ¥ Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Paketsystemet \"%s\" stöds inte" +msgstr "Paketsystemet \"%s\" stöds inte" # -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Kunde inte avgöra en lämpligt paketsystemstyp" +msgstr "Kunde inte fastställa en lämplig paketsystemstyp" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Kunde inte ta status på %s." +msgstr "Kunde inte ta status pÃ¥ %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list" +msgstr "Du mÃ¥ste lägga till nÃ¥gra \"source\"-URI:er i din sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas." +msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" +msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" -# "Package" är en sträng i inställningsfilen -#: apt-pkg/policy.cc:269 +# "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 inställningsfilen, \"Package\"-huvud saknas" +msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-huvud saknas" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Förstod inte nåltypen %s" +msgstr "Förstod inte nÃ¥ltypen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Prioritet ej angiven (eller noll) för nål" +msgstr "Prioritet ej angiven (eller noll) för nÃ¥l" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cachen har ett inkompatibelt versionssystem" -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:117 +# NewPackage etc. är funktionsnamn +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Grattis, du överskred antalet paketnamn denna APT kan hantera." +msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Grattis, du överskred antalet versioner denna APT kan hantera." +msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera." +msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." -# NewPackage etc. är funktionsnamn -#: apt-pkg/pkgcachegen.cc:241 +# NewPackage etc. är funktionsnamn +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "Paketet %s %s hittades inte när filberoenden hanterades" +msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Kunde inte ta status på källkodspaketlistan %s" +msgstr "Kunde inte ta status pÃ¥ källkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:658 +# Bättre ord? +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Samlar filberoenden" +msgstr "Samlar filtillhandahÃ¥llningar" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "In-/utfel vid lagring av källcache" +msgstr "In-/utfel vid lagring av källcache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5-kontrollsumma stämmer inte" +msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash-kontrollsumman stämmer inte" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n" +msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 "" -"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " -"manuellt måste reparera detta paket (på grund av saknad arkitektur)." +"Jag kunde inte hitta nÃ¥gon fil för paketet %s. Detta kan betyda att du " +"manuellt mÃ¥ste reparera detta paket (pÃ¥ grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1242 +#: 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 "" -"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " -"manuellt måste reparera detta paket." +"Jag kunde inte hitta nÃ¥gon fil för paketet %s. Detta kan betyda att du " +"manuellt mÃ¥ste reparera detta paket." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." +msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "Storleken stämmer inte" +msgstr "Storleken stämmer inte" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Leverantörsblock %s saknar fingeravtryck" +msgstr "Leverantörsblocket %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Använder cd-rom-monteringspunkt %s\n" +"Använder cd-rom-monteringspunkten %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Identifierar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "Etikett: %s \n" +msgid "Stored label: %s\n" +msgstr "Lagrad etikett: %s \n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterar cd-rom...\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Använder cd-rom-monteringspunkt %s\n" +msgstr "Använder cd-rom-monteringspunkten %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "Väntar på skiva...\n" +msgstr "Väntar pÃ¥ skiva...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Söker efter indexfiler på disken...\n" +msgstr "Söker efter indexfiler pÃ¥ skivan...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Hittade %i paketindex, %i källkodsindex och %i signaturer\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu " +"signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Hittade etiketten \"%s\"\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "Namnet är ogiltigt, försök igen.\n" +msgstr "Namnet är ogiltigt, försök igen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2691,129 +2803,133 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "Skriver ny källista\n" +msgstr "Skriver ny källista\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "Poster i källistan för denna skiva:\n" - -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Avmonterar cd-rom..." +msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Skrev %i poster med %i filer som inte stämmer\n" +msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" +msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Installerar %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Konfigurerar %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Tar bort %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Kör efterinstallationsutlösare %s" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Katalogen \"%s\" saknas" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "Förbereder %s" +msgstr "Förbereder %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" +msgstr "Förbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Konfigurerar %s" +msgid "Processing triggers for %s" +msgstr "Behandlar utlösare för %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Förbereder för borttagning av %s" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Tar bort %s" +msgstr "Förbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "Förbereder att ta bort hela %s" +msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n" + #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "Kunde inte lägga på programfix på filen" +msgstr "Kunde inte lägga pÃ¥ programfix pÃ¥ filen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Förbindelsen stängdes i förtid" - -# Felmeddelande för misslyckad chdir -#~ msgid "File date has changed %s" -#~ msgstr "Fildatumet har ändrats %s" - -#~ msgid "Reading file list" -#~ msgstr "Läser fillista" +msgstr "Anslutningen stängdes i förtid" -#~ msgid "Could not execute " -#~ msgstr "Kunde inte exekvera " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "Förbereder för borttagning med konfiguration %s" - -#~ msgid "Removed with config %s" -#~ msgstr "Borttagen med konfiguration %s" - -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Dynamisk MMap fick slut pÃ¥ utrymme" #~ msgid "" -#~ "Some broken packages were found while trying to process build-" -#~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "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 "" -#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan " -#~ "möjligen\n" -#~ "rätta detta genom att köra \"apt-get -f install\"." +#~ "Eftersom du bad om en enda handling är det mycket troligt att paketet\n" +#~ "helt enkelt inte kan installeras och att en felrapport om detta bör\n" +#~ "skickas in." -#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." -#~ msgstr "" -#~ "Beklagar, men du har inte tillräckligt ledigt utrymme pÃ¥ %s för att " -#~ "lagra alla .deb-filerna." +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Rad %d är för lÃ¥ng (max %lu)" diff --git a/po/th.po b/po/th.po new file mode 100644 index 0000000..c93984b --- /dev/null +++ b/po/th.po @@ -0,0 +1,2896 @@ +# Thai translation of apt. +# Copyright (C) 2007-2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt package. +# Theppiak Karoonboonyanan , 2007-2008. +# Arthit Suriyawongkul , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: apt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-06 15:54+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmdline/apt-cache.cc:143 +#, c-format +msgid "Package %s version %s has an unmet dep:\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" + +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "จำนวนชื่อแพกเกจทั้งหมด : " + +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " แพกเกจปกติ: " + +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " แพกเกจเสมือนแท้ๆ: " + +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " แพกเกจเสมือนที่มีแพกเกจจริงเดียว: " + +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " แพกเกจเสมือนผสม: " + +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " แพกเกจที่ขาดหาย: " + +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: " + +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: " + +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: " + +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: " + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: " + +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "จำนวนผังการตระเตรียมทั้งหมด: " + +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " +msgstr "จำนวนสตริงทั้งหมด: " + +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " +msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: " + +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "พื้นที่สำรองทั้งหมด: " + +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "พื้นที่ที่นับรวมทั้งหมด: " + +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." +msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง" + +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "คุณต้องระบุแพตเทิร์นด้วย" + +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "ไม่พบแพกเกจ" + +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +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 "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ" + +#: 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 "แพกเกจที่ถูกตรึง:" + +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(ไม่พบ)" + +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " ที่ติดตั้งอยู่: " + +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(ไม่มี)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " รุ่นที่ติดตั้งได้: " + +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr " การตรึงแพกเกจ: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " ตารางรุ่น:" + +#: 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:2575 cmdline/apt-sortpkgs.cc:144 +#, c-format +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 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 "" +"วิธีใช้: apt-cache [ตัวเลือก] คำสั่ง\n" +" apt-cache [ตัวเลือก] add file1 [file2 ...]\n" +" apt-cache [ตัวเลือก] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [ตัวเลือก] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache เป็นเครื่องมือระดับล่างสำหรับจัดการแฟ้มแคชไบนารีของ APT\n" +"และใช้สืบค้นข้อมูลจากแคช\n" +"\n" +"คำสั่ง:\n" +" add - เพิ่มแฟ้มแพกเกจเข้าในแคชของซอร์ส\n" +" gencaches - สร้างทั้งแคชของแพกเกจและแคชของซอร์ส\n" +" showpkg - แสดงข้อมูลทั่วไปของแพกเกจที่กำหนด\n" +" showsrc - แสดงระเบียนข้อมูลซอร์ส\n" +" stats - แสดงสถิติทั่วไป\n" +" dump - แสดงเนื้อหาแคชทั้งหมดในรูปแบบดิบ\n" +" dumpavail - แสดงข้อมูลแพกเกจที่มีทั้งหมดออกทาง stdout\n" +" unmet - แสดงความเชื่อมโยงที่ยังขาดหาย\n" +" search - ค้นรายชื่อแพกเกจด้วยนิพจน์เรกิวลาร์\n" +" show - แสดงข้อมูลของแพกเกจ\n" +" depends - แสดงข้อมูลแพกเกจที่ต้องใช้สำหรับแพกเกจที่กำหนด\n" +" rdepends - แสดงข้อมูลแพกเกจอื่นที่ต้องใช้แพกเกจที่กำหนด\n" +" pkgnames - แสดงรายชื่อแพกเกจทั้งหมด\n" +" dotty - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป GraphViz\n" +" xvcg - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป xvcg\n" +" policy - แสดงค่าตั้งนโยบาย\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -p=? แฟ้มเก็บแคชของแพกเกจ\n" +" -s=? แฟ้มเก็บแคชของซอร์ส\n" +" -q ปิดแถบแสดงความคืบหน้า\n" +" -i แสดงเฉพาะข้อมูลความเชื่อมโยงที่สำคัญสำหรับคำสั่ง unmet\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" +"กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page 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 4.0r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด" + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "อาร์กิวเมนต์ไม่ได้ระบุเป็นคู่ๆ" + +#: 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 "" +"วิธีใช้: apt-config [ตัวเลือก] คำสั่ง\n" +"\n" +"apt-config เป็นเครื่องมือง่ายๆ ที่ใช้อ่านแฟ้มค่าตั้ง APT\n" +"\n" +"คำสั่ง:\n" +" shell - โหมดเชลล์\n" +" dump - แสดงค่าตั้ง\n" +"\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 ที่ใช้การได้" + +#: 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 "" +"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n" +"ออกมาจากแพกเกจเดเบียน\n" +"\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" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" + +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" + +#: 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 "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" + +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" + +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" + +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %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 "" +"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n" +"คำสั่ง: 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 ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n" +"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n" +"\n" +"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb แฟ้ม Package\n" +"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n" +"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n" +"\n" +"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n" +"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n" +"\n" +"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n" +"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง และแฟ้ม override ก็ควรมีแฟล็ก\n" +"override ต่างๆ สำหรับแพกเกจ ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n" +"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" --md5 ควบคุมการสร้าง MD5\n" +" -s=? แฟ้ม override สำหรับซอร์ส\n" +" -q ทำงานแบบเงียบ\n" +" -d=? เลือกฐานข้อมูลแคชอื่น\n" +" --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n" +" --contents ควบคุมการสร้างแฟ้มสารบัญ\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" + +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "ไม่มีรายการเลือกที่ตรง" + +#: ftparchive/apt-ftparchive.cc:832 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" + +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old" + +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %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 "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" + +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %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 +#, c-format +msgid "Failed to stat %s" +msgstr "stat %s ไม่สำเร็จ" + +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "แพกเกจไม่มีระเบียนควบคุม" + +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" +msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" + +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n" + +#: ftparchive/writer.cc:81 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: stat %s ไม่สำเร็จ\n" + +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม " + +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#, c-format +msgid "Failed to resolve %s" +msgstr "หาพาธเต็มของ %s ไม่สำเร็จ" + +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "เดินท่องต้นไม้ไม่สำเร็จ" + +#: ftparchive/writer.cc:195 +#, c-format +msgid "Failed to open %s" +msgstr "เปิด %s ไม่สำเร็จ" + +#: ftparchive/writer.cc:254 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" + +#: ftparchive/writer.cc:262 +#, c-format +msgid "Failed to readlink %s" +msgstr "readlink %s ไม่สำเร็จ" + +#: ftparchive/writer.cc:266 +#, c-format +msgid "Failed to unlink %s" +msgstr "unlink %s ไม่สำเร็จ" + +#: ftparchive/writer.cc:273 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" + +#: ftparchive/writer.cc:283 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" + +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" + +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s ไม่มีข้อมูล override\n" + +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#, c-format +msgid " %s maintainer is %s not %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" + +#: ftparchive/writer.cc:624 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" + +#: ftparchive/contents.cc:321 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s" + +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" + +#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "ไม่สามารถเปิด %s" + +#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "แฟ้ม override %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" + +#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #3" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" +msgstr "ไม่สามารถอ่านแฟ้ม override %s" + +#: ftparchive/multicompress.cc:72 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" + +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" + +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" + +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" +msgstr "สร้าง FILE* ไม่สำเร็จ" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" +msgstr "fork ไม่สำเร็จ" + +#: ftparchive/multicompress.cc:212 +msgid "Compress child" +msgstr "โพรเซสลูกสำหรับบีบอัด" + +#: ftparchive/multicompress.cc:235 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" + +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" +msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" + +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" + +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "ตัวคลายบีบอัด" + +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" +msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" + +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" +msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" + +#: ftparchive/multicompress.cc:472 +#, c-format +msgid "Problem unlinking %s" +msgstr "มีปัญหาขณะลบแฟ้ม %s" + +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "Y" + +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#, c-format +msgid "Regex compilation error - %s" +msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" + +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" +msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" + +#: cmdline/apt-get.cc:331 +#, c-format +msgid "but %s is installed" +msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" + +#: cmdline/apt-get.cc:333 +#, c-format +msgid "but %s is to be installed" +msgstr "แต่รุ่นที่จะติดตั้งคือ %s" + +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "แต่ไม่สามารถติดตั้งได้" + +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" + +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "แต่ได้ติดตั้งไว้" + +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" + +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " หรือ" + +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" + +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" + +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" + +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" + +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" + +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" + +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (เนื่องจาก %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 "" +"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" +"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr "ติดตั้งซ้ำ %lu, " + +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "ปรับรุ่นลง %lu, " + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" + +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" + +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..." + +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " ล้มเหลว" + +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้" + +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" +msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้" + +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " เสร็จแล้ว" + +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "คุณอาจต้องเรียก `apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" + +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f" + +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" + +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" + +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? " + +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +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" + +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!" + +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้" + +#: cmdline/apt-get.cc:793 +msgid "Internal error, 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 "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" + +#: 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 "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" + +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email 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 "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n" + +#: cmdline/apt-get.cc:842 +#, c-format +msgid "Need to get %sB of archives.\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" + +#: cmdline/apt-get.cc:850 +#, c-format +msgid "After this operation, %sB disk space will be freed.\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" + +#: cmdline/apt-get.cc:871 +#, c-format +msgid "You don't have enough free space in %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 ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" + +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "Yes, do as I say!" + +#: 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 "" +"คุณกำลังจะทำสิ่งที่อาจเป็นอันตราย\n" +"หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n" +" ?] " + +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "เลิกทำ" + +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [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" + +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" + +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +msgid "Download complete and in download only mode" +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 อาจช่วยได้" + +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้" + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "จะล้มเลิกการติดตั้ง" + +#: cmdline/apt-get.cc:1053 +#, c-format +msgid "Note, selecting %s instead of %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" + +#: cmdline/apt-get.cc:1081 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" + +#: cmdline/apt-get.cc:1092 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n" + +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [ติดตั้งอยู่]" + +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง" + +#: 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 "" +"ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n" +"แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n" + +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:" + +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง" + +#: cmdline/apt-get.cc:1156 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n" + +#: cmdline/apt-get.cc:1164 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" + +#: cmdline/apt-get.cc:1193 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" + +#: cmdline/apt-get.cc:1195 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "ไม่พบรุ่น '%s' ของ '%s'" + +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n" + +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" + +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" + +#: cmdline/apt-get.cc:1435 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 "" +"ดูเหมือนการถอดถอนอัตโนมัติได้สร้างความเสียหายบางอย่าง ซึ่งไม่ควรเกิดขึ้น\n" +"กรุณารายงานบั๊กนี้ของแพกเกจ 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 "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" + +#: cmdline/apt-get.cc:1468 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "ไม่พบงาน %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#, c-format +msgid "Couldn't find package %s" +msgstr "ไม่พบแพกเกจ %s" + +#: cmdline/apt-get.cc:1661 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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' เพื่อแก้ปัญหานี้ได้:" + +#: 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' โดยไม่ระบุแพกเกจ " +"(หรือจะระบุทางแก้ก็ได้)" + +#: 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 "" +"ไม่สามารถติดตั้งบางแพกเกจได้ คุณอาจระบุเงื่อนไขการติดตั้งที่เป็นไปไม่ได้\n" +"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" +"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" + +#: cmdline/apt-get.cc:1738 +msgid "Broken packages" +msgstr "แพกเกจมีปัญหา" + +#: cmdline/apt-get.cc:1767 +msgid "The following extra packages will be installed:" +msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" + +#: cmdline/apt-get.cc:1856 +msgid "Suggested packages:" +msgstr "แพกเกจที่แนะนำ:" + +#: cmdline/apt-get.cc:1857 +msgid "Recommended packages:" +msgstr "แพกเกจที่ควรใช้ร่วมกัน:" + +#: cmdline/apt-get.cc:1885 +msgid "Calculating upgrade... " +msgstr "กำลังคำนวณการปรับรุ่น... " + +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +msgid "Failed" +msgstr "ล้มเหลว" + +#: cmdline/apt-get.cc:1893 +msgid "Done" +msgstr "เสร็จแล้ว" + +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +msgid "Internal error, problem resolver broke stuff" +msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" + +#: cmdline/apt-get.cc:2068 +msgid "Must specify at least one package to fetch source for" +msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" + +#: 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:2147 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" + +#: cmdline/apt-get.cc:2175 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" + +#: 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:2184 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" + +#: cmdline/apt-get.cc:2190 +#, c-format +msgid "Fetch source %s\n" +msgstr "ดาวน์โหลดซอร์ส %s\n" + +#: cmdline/apt-get.cc:2221 +msgid "Failed to fetch some archives." +msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" + +#: cmdline/apt-get.cc:2249 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" + +#: cmdline/apt-get.cc:2261 +#, c-format +msgid "Unpack command '%s' failed.\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" + +#: cmdline/apt-get.cc:2279 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "คำสั่ง build '%s' ล้มเหลว\n" + +#: cmdline/apt-get.cc:2298 +msgid "Child process failed" +msgstr "โพรเซสลูกล้มเหลว" + +#: cmdline/apt-get.cc:2314 +msgid "Must specify at least one package to check builddeps for" +msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" + +#: cmdline/apt-get.cc:2362 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" + +#: cmdline/apt-get.cc:2414 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" + +#: cmdline/apt-get.cc:2467 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " +"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" + +#: 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:2530 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" + +#: cmdline/apt-get.cc:2544 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" + +#: cmdline/apt-get.cc:2548 +msgid "Failed to process build dependencies" +msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" + +#: cmdline/apt-get.cc:2580 +msgid "Supported modules:" +msgstr "มอดูลที่รองรับ:" + +#: cmdline/apt-get.cc:2621 +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 "" +"วิธีใช้: apt-get [ตัวเลือก] คำสั่ง\n" +" apt-get [ตัวเลือก] install|remove pkg1 [pkg2 ...]\n" +" apt-get [ตัวเลือก] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get เป็นคำสั่งง่ายๆ สำหรับดาวน์โหลดและติดตั้งแพกเกจ คำสั่งที่ใช้บ่อยที่สุดก็คือ\n" +"update และ install\n" +"\n" +"คำสั่ง:\n" +" update - ดาวน์โหลดรายชื่อแพกเกจชุดใหม่\n" +" upgrade - ปรับรุ่นแพกเกจต่างๆ ขึ้น\n" +" install - ติดตั้งแพกเกจใหม่ (pkg อยู่ในรูปเช่น libc6 ไม่ใช่ libc6.deb)\n" +" remove - ถอดถอนแพกเกจ\n" +" autoremove - ถอดถอนแพกเกจที่ไม่ใช้แล้วโดยอัตโนมัติ\n" +" purge - ถอดถอนแพกเกจพร้อมลบค่าตั้งทั้งหมด\n" +" source - ดาวน์โหลดซอร์สโค้ดของแพกเกจ\n" +" build-dep - ติดตั้งสิ่งที่จำเป็นสำหรับการ build ของแพกเกจซอร์สโค้ด\n" +" dist-upgrade - ปรับรุ่นขึ้นแบบข้ามรุ่นจัดแจก ดู apt-get(8)\n" +" dselect-upgrade - ทำตามสิ่งที่เลือกโดย dselect\n" +" clean - ลบแฟ้มแพกเกจที่ดาวน์โหลดมา\n" +" autoclean - ลบแฟ้มแพกเกจเก่าที่ดาวน์โหลดมา\n" +" check - ตรวจสอบว่าไม่มีความเชื่อมโยงที่เสียระหว่างแพกเกจ\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -q แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n" +" -qq ไม่ต้องแสดงผลลัพธ์ ยกเว้นข้อผิดพลาด\n" +" -d ดาวน์โหลดอย่างเดียว - *ไม่ต้อง* ติดตั้งหรือแตกแพกเกจ\n" +" -s ไม่ต้องทำจริง เพียงจำลองลำดับการทำงานเท่านั้น\n" +" -y ตอบ Yes สำหรับทุกคำถามโดยไม่ต้องถาม\n" +" -f พยายามแก้ไขระบบในกรณีที่มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ\n" +" -m พยายามดำเนินการต่อถ้าหาแฟ้มแพกเกจไม่พบ\n" +" -u แสดงรายชื่อของแพกเกจที่จะปรับรุ่นทั้งหมดด้วย\n" +" -b build แพกเกจซอร์สหลังจากดาวน์โหลดมาแล้วด้วย\n" +" -V แสดงเลขรุ่นแบบยาวของโปรแกรม\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" +"กรุณาอ่านข้อมูลและตัวเลือกเพิ่มเติมจาก manual page apt-get(8), sources.list(5)\n" +"และ apt.conf(5)\n" +" APT นี้มีพลังของ Super Cow\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "เจอ " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "ดึง:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "ข้าม " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "ปัญหา " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [กำลังทำงาน]" + +#: 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 "" +"เปลี่ยนแผ่น: กรุณาใส่แผ่นชื่อ\n" +" '%s'\n" +"ลงในไดรว์ %s แล้วกด enter\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!" + +#: 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 "" +"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n" +"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -s เรียงตามแฟ้มซอร์สโค้ด\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +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 เพื่อดำเนินการต่อ" + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "คุณต้องการจะลบแฟ้ม .deb ต่างๆ ที่ได้ดาวน์โหลดมาก่อนหน้านี้หรือไม่?" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว" + +#: dselect/install:102 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "ซึ่งไม่มีปัญหาอะไร มีเฉพาะข้อผิดพลาดก่อนหน้าข้อความนี้เท่านั้นที่สำคัญ" + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "กรุณาแก้ปัญหาเหล่านั้น แล้วเรียกติดตั้งใหม่อีกครั้ง" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "กำลังผสานรายชื่อแพกเกจที่มี" + +#: apt-inst/contrib/extracttar.cc:114 +msgid "Failed to create pipes" +msgstr "สร้างไปป์ไม่สำเร็จ" + +#: apt-inst/contrib/extracttar.cc:141 +msgid "Failed to exec gzip " +msgstr "เรียก gzip ไม่สำเร็จ" + +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +msgid "Corrupted archive" +msgstr "แฟ้มจัดเก็บเสียหาย" + +#: apt-inst/contrib/extracttar.cc:193 +msgid "Tar checksum failed, archive corrupted" +msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" + +#: apt-inst/contrib/extracttar.cc:296 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" + +#: apt-inst/contrib/arfile.cc:70 +msgid "Invalid archive signature" +msgstr "เอกลักษณ์ archive ไม่ถูกต้อง" + +#: apt-inst/contrib/arfile.cc:78 +msgid "Error reading archive member header" +msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิก archive" + +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +msgid "Invalid archive member header" +msgstr "ข้อมูลส่วนหัวของสมาชิก archive ไม่ถูกต้อง" + +#: apt-inst/contrib/arfile.cc:128 +msgid "Archive is too short" +msgstr "archive สั้นเกินไป" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Failed to read the archive headers" +msgstr "อ่านข้อมูลส่วนหัวของ archive ไม่สำเร็จ" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "จองเนื้อที่สำหรับ diversion ไม่สำเร็จ" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in 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" + +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" + +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "แฟ้มค่าตั้ง %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 "ไม่สามารถเขียนแฟ้ม %s" + +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#, c-format +msgid "Failed to close file %s" +msgstr "ไม่สามารถปิดแฟ้ม %s" + +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#, c-format +msgid "The path %s is too long" +msgstr "พาธ %s ยาวเกินไป" + +#: apt-inst/extract.cc:124 +#, c-format +msgid "Unpacking %s more than once" +msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง" + +#: apt-inst/extract.cc:134 +#, c-format +msgid "The directory %s is diverted" +msgstr "ไดเรกทอรี %s ถูก divert" + +#: apt-inst/extract.cc:144 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s" + +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +msgid "The diversion path is too long" +msgstr "พาธของ diversion ยาวเกินไป" + +#: apt-inst/extract.cc:240 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี" + +#: apt-inst/extract.cc:280 +msgid "Failed to locate node in its hash bucket" +msgstr "หาโหนดใน bucket ของแฮชไม่พบ" + +#: apt-inst/extract.cc:284 +msgid "The path is too long" +msgstr "พาธยาวเกินไป" + +#: apt-inst/extract.cc:414 +#, c-format +msgid "Overwrite package match with no version for %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" + +#: 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" + +#: apt-inst/extract.cc:491 +#, c-format +msgid "Unable to stat %s" +msgstr "ไม่สามารถ stat %s" + +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#, c-format +msgid "Failed to remove %s" +msgstr "ไม่สามารถลบ %s" + +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#, c-format +msgid "Unable to create %s" +msgstr "ไม่สามารถสร้าง %s" + +#: apt-inst/deb/dpkgdb.cc:114 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "ไม่สามารถ stat %sinfo" + +#: apt-inst/deb/dpkgdb.cc:119 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน" + +#. 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 "กำลังอ่านรายชื่อแพกเกจ" + +#: apt-inst/deb/dpkgdb.cc:176 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "ไม่สามารถเปลี่ยนไปยังไดเรกทอรีระบบ %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 "เกิดข้อผิดพลาดภายในขณะอ่านชื่อแพกเกจ" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +msgid "Reading file listing" +msgstr "กำลังอ่านรายชื่อแฟ้ม" + +#: 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 "" +"เปิดแฟ้มรายชื่อแฟ้ม '%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 ไม่สำเร็จ" + +#: apt-inst/deb/dpkgdb.cc:262 +msgid "Internal error getting a node" +msgstr "เกิดข้อผิดพลาดภายในขณะอ่านโหนด" + +#: apt-inst/deb/dpkgdb.cc:305 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "เปิดแฟ้ม diversion %sdiversions ไม่สำเร็จ" + +#: apt-inst/deb/dpkgdb.cc:320 +msgid "The diversion file is corrupted" +msgstr "แฟ้ม diversion เสียหาย" + +#: 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 "ข้อมูลผิดพลาดในแฟ้ม diversion: %s" + +#: apt-inst/deb/dpkgdb.cc:358 +msgid "Internal error adding a diversion" +msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion" + +#: apt-inst/deb/dpkgdb.cc:379 +msgid "The pkg cache must be initialized first" +msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน" + +#: apt-inst/deb/dpkgdb.cc:439 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "หาข้อมูลส่วนหัว Package: ไม่พบ ที่ออฟเซ็ต %lu" + +#: apt-inst/deb/dpkgdb.cc:461 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "หมวด ConfFile เสียหายในแฟ้ม status ที่ออฟเซ็ต %lu" + +#: apt-inst/deb/dpkgdb.cc:466 +#, c-format +msgid "Error parsing 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'" + +#: 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'" + +#: apt-inst/deb/debfile.cc:110 +#, c-format +msgid "Couldn't change to %s" +msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s" + +#: apt-inst/deb/debfile.cc:140 +msgid "Internal error, could not locate member" +msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก" + +#: apt-inst/deb/debfile.cc:173 +msgid "Failed to locate a valid control file" +msgstr "ไม่พบแฟ้มควบคุมที่ใช้การได้" + +#: apt-inst/deb/debfile.cc:258 +msgid "Unparsable control file" +msgstr "ไม่สามารถแจงแฟ้มควบคุมได้" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %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 รู้จักซีดีรอมนี้ apt-get update ไม่สามารถใช้เพิ่มซีดีรอมใหม่ได้" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "ซีดีรอมผิดแผ่น" + +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "ไม่สามารถเลิกเมานท์ซีดีรอมใน %s แผ่นอาจกำลังถูกใช้งานอยู่" + +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "ไม่พบแผ่น" + +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "ไม่พบแฟ้ม" + +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "stat ไม่สำเร็จ" + +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "URI ไม่ถูกต้อง URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "เข้าระบบ" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า" + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "หมดเวลารอเชื่อมต่อ" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +msgid "Read error" +msgstr "การอ่านข้อมูลผิดพลาด" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "คำตอบท่วมบัฟเฟอร์" + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "มีความเสียหายของโพรโทคอล" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +msgid "Write error" +msgstr "การเขียนข้อมูลผิดพลาด" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "ไม่สามารถสร้างซ็อกเก็ต" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive" + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "ไม่สามารถ bind ซ็อกเก็ต" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "ไม่สามารถส่งคำสั่ง PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "ไม่สามารถรับการเชื่อมต่อ" + +#: 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'" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "สอบถาม" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "ไม่สามารถเรียก " + +#: methods/connect.cc:70 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "เชื่อมต่อไปยัง %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 "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %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)" + +#: methods/connect.cc:104 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย" + +#: methods/connect.cc:119 +#, c-format +msgid "Could not connect to %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" + +#: methods/connect.cc:165 methods/connect.cc:184 +#, c-format +msgid "Could not resolve '%s'" +msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'" + +#: methods/connect.cc:190 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'" + +#: methods/connect.cc:193 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)" + +#: methods/connect.cc:240 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:" + +#: methods/gpgv.cc:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'" + +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน" + +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" + +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" + +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" + +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" + +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\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" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "ไม่สามารถเปิดไปป์สำหรับ %s" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s" + +#: methods/http.cc:377 +msgid "Waiting for headers" +msgstr "รอหัวข้อมูล" + +#: methods/http.cc:523 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ" + +#: methods/http.cc:531 +msgid "Bad header line" +msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด" + +#: methods/http.cc:550 methods/http.cc:557 +msgid "The HTTP server sent an invalid reply header" +msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง" + +#: methods/http.cc:586 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง" + +#: methods/http.cc:601 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง" + +#: methods/http.cc:603 +msgid "This HTTP server has broken range support" +msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด" + +#: methods/http.cc:627 +msgid "Unknown date format" +msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" + +#: methods/http.cc:774 +msgid "Select failed" +msgstr "select ไม่สำเร็จ" + +#: methods/http.cc:779 +msgid "Connection timed out" +msgstr "หมดเวลารอเชื่อมต่อ" + +#: methods/http.cc:802 +msgid "Error writing to output file" +msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" + +#: methods/http.cc:833 +msgid "Error writing to file" +msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" + +#: methods/http.cc:861 +msgid "Error writing to the file" +msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" + +#: methods/http.cc:875 +msgid "Error reading from server. Remote end closed connection" +msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" + +#: methods/http.cc:877 +msgid "Error reading from server" +msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "ไม่สามารถตัดท้ายแฟ้ม" + +#: methods/http.cc:1105 +msgid "Bad header data" +msgstr "ข้อมูลส่วนหัวผิดพลาด" + +#: methods/http.cc:1122 methods/http.cc:1177 +msgid "Connection failed" +msgstr "เชื่อมต่อไม่สำเร็จ" + +#: methods/http.cc:1229 +msgid "Internal error" +msgstr "ข้อผิดพลาดภายใน" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" +msgstr "ไม่สามารถ mmap แฟ้มเปล่า" + +#: apt-pkg/contrib/mmap.cc:85 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์" + +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 +#, c-format +msgid "Selection %s not found" +msgstr "ไม่พบรายการเลือก %s" + +#: apt-pkg/contrib/configuration.cc:439 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" + +#: apt-pkg/contrib/configuration.cc:497 +#, c-format +msgid "Opening configuration file %s" +msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" + +#: apt-pkg/contrib/configuration.cc:662 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" + +#: apt-pkg/contrib/configuration.cc:681 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" + +#: apt-pkg/contrib/configuration.cc:698 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +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: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" + +#: apt-pkg/contrib/configuration.cc:745 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" + +#: 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: include จากที่นี่" + +#: apt-pkg/contrib/configuration.cc:758 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" + +#: apt-pkg/contrib/configuration.cc:809 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" + +#: apt-pkg/contrib/progress.cc:153 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... ผิดพลาด!" + +#: apt-pkg/contrib/progress.cc:155 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... เสร็จแล้ว" + +#: apt-pkg/contrib/cmndline.cc:77 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +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" + +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน" + +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#, c-format +msgid "Option %s requires an argument." +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: การกำหนดรายการค่าตั้งต้องมี =" + +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'" + +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format +msgid "Option '%s' is too long" +msgstr "ตัวเลือก '%s' ยาวเกินไป" + +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false" + +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "ไม่รู้จักคำสั่ง %s" + +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "ไม่สามารถ stat จุดเมานท์ %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" + +#: apt-pkg/contrib/cdromutl.cc:188 +msgid "Failed to stat the cdrom" +msgstr "ไม่สามารถ stat ซีดีรอม" + +#: apt-pkg/contrib/fileutl.cc:149 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" + +#: apt-pkg/contrib/fileutl.cc:154 +#, c-format +msgid "Could not open lock file %s" +msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" + +#: apt-pkg/contrib/fileutl.cc:172 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" + +#: apt-pkg/contrib/fileutl.cc:176 +#, c-format +msgid "Could not get lock %s" +msgstr "ไม่สามารถล็อค %s" + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" + +#: apt-pkg/contrib/fileutl.cc:454 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" + +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" + +#: apt-pkg/contrib/fileutl.cc:459 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" + +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format +msgid "Could not open file %s" +msgstr "ไม่สามารถเปิดแฟ้ม %s" + +#: apt-pkg/contrib/fileutl.cc:559 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" + +#: apt-pkg/contrib/fileutl.cc:589 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" + +#: apt-pkg/contrib/fileutl.cc:664 +msgid "Problem closing the file" +msgstr "เกิดปัญหาขณะปิดแฟ้ม" + +#: apt-pkg/contrib/fileutl.cc:670 +msgid "Problem unlinking the file" +msgstr "เกิดปัญหาขณะลบแฟ้ม" + +#: apt-pkg/contrib/fileutl.cc:681 +msgid "Problem syncing the file" +msgstr "เกิดปัญหาขณะ sync แฟ้ม" + +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "แคชของแพกเกจว่างเปล่า" + +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "แฟ้มแคชของแพกเกจเสียหาย" + +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน" + +#: apt-pkg/pkgcache.cc:148 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'" + +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น" + +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "ต้องใช้" + +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "ต้องใช้ขณะติดตั้ง" + +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "แนะนำ" + +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "ควรใช้ร่วมกับ" + +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "ขัดแย้งกับ" + +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "แทนที่" + +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "ใช้แทน" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "ทำให้พัง" + +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "สำคัญ" + +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "จำเป็น" + +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "มาตรฐาน" + +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "ตัวเลือก" + +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "ส่วนเสริม" + +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์" + +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "รุ่นแพกเกจที่มี" + +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" +msgstr "สร้างลำดับความสัมพันธ์" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "กำลังอ่านข้อมูลสถานะ" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" + +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" + +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" + +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" + +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" + +#: apt-pkg/sourcelist.cc:101 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" + +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" + +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %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 "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" + +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" + +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)" + +#: 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 "" +"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว " +"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ " +"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย " +"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak" + +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" +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 ซ้ำ แต่หาตัวแพกเกจไม่พบ" + +#: apt-pkg/algorithms.cc:1107 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " +"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" + +#: apt-pkg/algorithms.cc:1109 +msgid "Unable to correct problems, you have held broken packages." +msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" + +#: 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 "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" + +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" + +#: apt-pkg/acquire.cc:63 +#, c-format +msgid "Archive directory %spartial is missing." +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)" + +#: apt-pkg/acquire.cc:830 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li" + +#: apt-pkg/acquire-worker.cc:110 +#, c-format +msgid "The method driver %s could not be found." +msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s" + +#: apt-pkg/acquire-worker.cc:159 +#, c-format +msgid "Method %s did not start correctly" +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" + +#: apt-pkg/init.cc:124 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "ไม่รองรับระบบแพกเกจ '%s'" + +#: apt-pkg/init.cc:140 +msgid "Unable to determine a suitable packaging system type" +msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้" + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "ไม่สามารถ stat %s" + +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย" + +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้" + +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" +msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'" + +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" +msgstr "ไม่เข้าใจชนิดการตรึง %s" + +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" + +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน" + +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)" + +#: apt-pkg/pkgcachegen.cc:193 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:224 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:228 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:232 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว" + +#: apt-pkg/pkgcachegen.cc:265 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว" + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว" + +#: apt-pkg/pkgcachegen.cc:271 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" + +#: apt-pkg/pkgcachegen.cc:299 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:312 +#, c-format +msgid "Error occurred while processing %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 ขณะประมวลผลความขึ้นต่อแฟ้ม" + +#: apt-pkg/pkgcachegen.cc:690 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" + +#: apt-pkg/pkgcachegen.cc:775 +msgid "Collecting File Provides" +msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" + +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +msgid "IO Error saving source cache" +msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" + +#: apt-pkg/acquire-item.cc:127 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" + +#: apt-pkg/acquire-item.cc:401 +msgid "MD5Sum mismatch" +msgstr "MD5Sum ไม่ตรงกัน" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "ผลรวมแฮชไม่ตรงกัน" + +#: apt-pkg/acquire-item.cc:1118 +msgid "There is no public key available for the following key IDs:\n" +msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\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 คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" + +#: 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 คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" + +#: apt-pkg/acquire-item.cc:1331 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" + +#: apt-pkg/acquire-item.cc:1418 +msgid "Size mismatch" +msgstr "ขนาดไม่ตรงกัน" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" + +#: apt-pkg/cdrom.cc:529 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"กำลังใช้จุดเมานท์ซีดีรอม %s\n" +"กำลังเมานท์ซีดีรอม\n" + +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "กำลังตรวจสอบชื่อแผ่น.. " + +#: apt-pkg/cdrom.cc:563 +#, c-format +msgid "Stored label: %s\n" +msgstr "ชื่อที่เก็บไว้: %s\n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" + +#: apt-pkg/cdrom.cc:590 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n" + +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "กำลังเลิกเมานท์ซีดีรอม\n" + +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "กำลังรอแผ่น...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "กำลังเมานท์ซีดีรอม...\n" + +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\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" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "พบชื่อแผ่น '%s'\n" + +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n" + +#: apt-pkg/cdrom.cc:760 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"แผ่นนี้เรียกชื่อว่า:\n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "กำลังคัดลอกรายชื่อแพกเกจ..." + +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n" + +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" +msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" + +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#, c-format +msgid "Wrote %i records.\n" +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" + +#: 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" + +#: 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" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "กำลังติดตั้ง %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "กำลังตั้งค่า %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "กำลังถอดถอน %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "ไม่มีไดเรกทอรี '%s'" + +#: apt-pkg/deb/dpkgpm.cc:605 +#, c-format +msgid "Preparing %s" +msgstr "กำลังเตรียม %s" + +#: apt-pkg/deb/dpkgpm.cc:606 +#, c-format +msgid "Unpacking %s" +msgstr "กำลังแตกแพกเกจ %s" + +#: apt-pkg/deb/dpkgpm.cc:611 +#, c-format +msgid "Preparing to configure %s" +msgstr "กำลังเตรียมตั้งค่า %s" + +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, c-format +msgid "Processing triggers for %s" +msgstr "กำลังประมวลผลการสะกิดสำหรับ %s" + +#: apt-pkg/deb/dpkgpm.cc:617 +#, c-format +msgid "Installed %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" + +#: apt-pkg/deb/dpkgpm.cc:628 +#, c-format +msgid "Removed %s" +msgstr "ถอดถอน %s แล้ว" + +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" + +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format +msgid "Completely removed %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" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "ไม่สามารถแพตช์แฟ้ม" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "เนื้อที่สำหรับทำ 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 "" +#~ "และเนื่องจากคุณได้สั่งดำเนินการเพียงรายการเดียวเท่านั้น ก็เป็นไปได้สูงว่าแพกเกจนี้เสีย\n" +#~ "คุณควรจะรายงานบั๊กสำหรับแพกเกจนี้" + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "บรรทัด %d ยาวเกินไป (สูงสุด %u)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "บรรทัด %d ยาวเกินไป (สูงสุด %u)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)" + +#, 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 รายการ และลายเซ็น %i " +#~ "รายการ\n" + +#~ msgid "openpty failed\n" +#~ msgstr "openpty ล้มเหลว\n" diff --git a/po/tl.po b/po/tl.po index ae23c5d..3d5976d 100644 --- a/po/tl.po +++ b/po/tl.po @@ -5,13 +5,13 @@ # Eric Pareja , 2005 # This file is maintained by Eric Pareja # Itong talaksan ay inaalagaan ni Eric Pareja -# +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-03-16 15:53+0800\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" "MIME-Version: 1.0\n" @@ -19,145 +19,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Kabuuan ng mga Pakete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal na Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Purong Birtwual na Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Nag-iisang Birtwal na Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Halong Birtwal na Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Kulang/Nawawala: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Kabuuan ng Natatanging mga Bersyon: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Kabuuan ng Natatanging mga Bersyon: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Kabuuan ng mga Dependensiya: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Kabuuan ng ugnayang Ber/Talaksan: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Kabuuan ng ugnayang Ber/Talaksan: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Kabuuan ng Mapping ng Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Kabuuan ng Globbed String: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Kabuuan ng Hindi Nagamit na puwang: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(hindi nahanap)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(wala)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -180,8 +191,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -219,7 +230,7 @@ msgstr "" " ng pakete\n" " rdepends - Ipakita ang impormasyong kabaliktarang dependensiya ng pakete\n" " pkgnames - Ipakita ang listahan ng pangalan ng lahat ng mga pakete\n" -" dotty - Bumuo ng graph ng mga pakete para sa GraphVis\n" +" dotty - Bumuo ng graph ng mga pakete para sa GraphViz\n" " xvcg - Bumuo ng graph ng mga pakete para sa xvcg\n" " policy - Ipakita ang pagkaayos ng mga policy\n" "\n" @@ -307,7 +318,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -316,31 +327,31 @@ msgstr "Hindi makapagsulat sa %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 sa pagproseso ng directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -425,303 +436,305 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Walang mga pinili na tugma" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" -#: ftparchive/cachedb.cc:76 +#: 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 "" +"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " +"bersiyon ng apt, tanggalin at likhain muli ang database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Hindi mabasa ang directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Hindi ma-stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Mga error ay tumutukoy sa talaksang " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Bigo sa pag-resolba ng %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Bigo ang paglakad sa puno" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Bigo ang pagbukas ng %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Bigo ang pagbasa ng link %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Bigo ang pag-unlink ng %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Bigo ang pag-link ng %s sa %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:623 -#, fuzzy, c-format +#: ftparchive/writer.cc:620 +#, c-format msgid " %s has no source override entry\n" -msgstr " %s ay walang override entry\n" +msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format +#: ftparchive/writer.cc:624 +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s ay walang override entry\n" +msgstr " %s ay wala ring override entry na binary\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Internal error, hindi mahanap ang miyembrong %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Hindi mabuksan %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Maling anyo ng override %s linya %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Bigo ang pagbasa ng talaksang override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Hindi kilalang algorithmong compression '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Kailangan ng compression set ang compressed output %s" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Bigo ang paglikha ng FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Bigo ang pag-fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Anak para sa pag-Compress" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "taga-decompress" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -729,150 +742,150 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " ay bigo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." "org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -883,28 +896,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -912,48 +925,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,76 +977,119 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " -"mga luma na lamang." -#: cmdline/apt-get.cc:1403 +#: 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 "" + +#. +#. 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 "" +"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" + +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Error na internal, may nasira ang problem resolver" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Hindi mahanap ang paketeng %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "ngunit ang %s ay iluluklok" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1041,7 +1097,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1052,130 +1108,115 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1569 -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 "" -"Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n" -"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" -"pakete na ito." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1184,7 +1225,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1234,33 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1233,6 +1275,8 @@ msgid "" " 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" @@ -1248,7 +1292,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1368,25 +1412,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Maling nakatakda na default!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Pindutin ang enter upang magpatuloy." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "o mga error na dulot ng kulang na dependensiya. Ito ay ayos lamang, yun lang" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1397,188 +1445,188 @@ msgstr "" msgid "Merging available information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Hindi tanggap na signature ng arkibo" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Bitin ang arkibo. Sobrang iksi." -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Bigo ang pagbasa ng header ng arkibo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Tinawagan ang DropNode sa naka-link pa na node" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Bigo sa paghanap ng elemento ng hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Bigo ang pagreserba ng diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error sa AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobleng pagdagdag ng diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Sobrang haba ang path na %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Binubuklat ang %s ng labis sa isang beses" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Ang directory %s ay divertado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Sobrang haba ng path na diversion" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ang directory %s ay papalitan ng hindi-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Sobrang haba ng path" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Hindi mabasa ang %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Hindi ma-stat ang %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Bigo sa pagtanggal ng %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Hindi malikha ang %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Bigo sa pag-stat ng %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Binabasa ang Listahan ng mga Pakete" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Bigo sa paglipat sa admin dir %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Internal error sa pagkuha ng pangalan ng pakete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Binabasa ang Talaksang Listahan" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1589,78 +1637,78 @@ msgstr "" "ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang " "parehong bersyon ng pakete!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internal error sa pagkuha ng Node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Ang talaksang diversion ay sira" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Di tanggap na linya sa talaksang diversion: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internal error sa pagdagdag ng diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Ang cache ng pkg ay dapat ma-initialize muna" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Maling ConfFile section sa talaksang status. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error sa pag-parse ng MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s' o '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Hindi makalipat sa %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Internal error, hindi mahanap ang miyembro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Bigo sa paghanap ng tanggap na talaksang control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Di maintindihang talaksang control" @@ -1681,26 +1729,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Maling CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Bigo ang pag-stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1762,7 +1809,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1774,7 +1821,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -1784,11 +1831,11 @@ msgstr "Hindi maka-likha ng socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Hindi maka-konek sa socket ng datos, nag-time-out ang koneksyon" +msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Hindi maka-konek sa socket na passive." +msgstr "Hindi maka-konekta sa socket na passive." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" @@ -1828,7 +1875,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1855,99 +1902,100 @@ msgstr "Tanong" msgid "Unable to invoke " msgstr "Hindi ma-invoke " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Kumokonek sa %s (%s)" +msgstr "Kumokonekta sa %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon" +msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Hindi maka-konek sa %s:%s (%s)." +msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Kumokonek sa %s" +msgstr "Kumokonekta sa %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Hindi maka-konek sa %s %s:" +msgstr "Hindi maka-konekta sa %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Hindi maresolba ang '%s'" +msgstr "Hindi mabasa ang keyring: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " "Lalabas." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:213 -#, fuzzy, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" +"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1965,433 +2013,460 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s" msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Bigo sa pagsulat ng talaksang %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Internal na error" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Hindi mai-mmap ang talaksang walang laman" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Labis ang haba ng linyang %d (max %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Tapos" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Opsyon sa command line %s ay di naintindihan." -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opsyon sa command line %s ay hindi boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opsyon %s ay nangangailangan ng argumento" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opsyon '%s' ay labis ang haba" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Hindi naintindihan ang %s, subukan ang true o false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Di makalipat sa %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Walang laman ang cache ng pakete" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Sira ang talaksan ng cache ng pakete" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dependensiya" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Mungkahi" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekomendado" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Tunggali" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Pumapalit" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Linalaos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "kailangan" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Pinagsasama ang magagamit na impormasyon" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Bigo ang pagbukas ng %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Bigo sa pagsulat ng talaksang %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2403,12 +2478,12 @@ msgstr "" "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" "activate ang APT::Force-LoopBreak na option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hindi suportado ang uri ng talaksang index na '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2416,7 +2491,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2424,188 +2499,214 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " +"mga luma na lamang." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:828 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Binabasa ang Talaksang Listahan" +msgstr "Kinukuha ang talaksang %li ng %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ang driver ng paraang %s ay hindi mahanap." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Hindi ma-stat ang %s" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Hindi akma ang versioning system ng cache" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1070 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 #, fuzzy +msgid "Hash Sum mismatch" +msgstr "Di tugmang MD5Sum" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n" +msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2614,7 +2715,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2623,7 +2724,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2631,7 +2732,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2640,7 +2741,7 @@ msgstr "Di tugmang laki" msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2649,49 +2750,61 @@ msgstr "" "Ginagamit ang %s bilang mount point ng CD-ROM\n" "Sinasalang ang CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Kinikilala..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Ina-unmount ang CD-ROM..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Naka-imbak na Label: %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2700,103 +2813,165 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Ina-unmount ang CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Iniluklok ang %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Isasaayos ang %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Tinatanggal ang %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Nawawala ang directory ng talaan %spartial." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "Isasaayos ang %s" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "Error sa pagproseso ng directory %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Tinatanggal ang %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format msgid "Preparing to completely remove %s" -msgstr "Hinahanda ang %s upang isaayos" +msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format msgid "Completely removed %s" -msgstr "Bigo sa pagtanggal ng %s" +msgstr "Natanggal ng lubusan ang %s" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Hindi mabuksan ang talaksang %s" +msgstr "Hindi mai-patch ang talaksan" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ 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 "" +#~ "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete " +#~ "ay\n" +#~ "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" +#~ "pakete na ito." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Labis ang haba ng linyang %d (max %d)" + +#, fuzzy +#~ msgid "Line %d too long (max %d)" +#~ msgstr "Labis ang haba ng linyang %d (max %d)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Stored label: %s \n" +#~ msgstr "Naka-imbak na Label: %s \n" + +#, fuzzy +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " +#~ "signature\n" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Bigo ang pagpili" + #~ msgid "File date has changed %s" #~ msgstr "Nagbago ang petsa ng talaksang %s" diff --git a/po/uk.po b/po/uk.po index a2848d0..1fdb410 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko \n" "Language-Team: Українська \n" @@ -15,145 +15,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакунок %s версії %s має незадоволену залежність:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Всього імен пакунків : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Нормальних пакунків: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Чисто віртуальних пакунків: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Окремих віртуальних пакунків: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Змішаних віртуальних пакунків: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Пропущено: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Всього унікальних версій: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total distinct descriptions: " +msgstr "Всього унікальних версій: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Всього залежностей: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Всього відносин Версія/Файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Всього відносин Версія/Файл: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Всього відносин Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Всього розгорнутих рядків: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Всього інформації про залежності: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Порожнього місця в кеші: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Загальний простір полічений для: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Перелік пакунків %s розсинхронізований." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Ви повинні задати рівно один шаблон" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Не знайдено жодного пакунка" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Переліки пакунків:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Зафіксовані пакунки:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(не знайдено)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Встановлено: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(відсутній)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Фіксатор(pin) пакунка: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 -#, c-format -msgid "%s %s for %s %s compiled on %s %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:2575 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпільовано %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +187,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -211,8 +222,8 @@ msgstr "" " show - показати інформацію про пакунок в зрозумілій формі\n" " depends - показати інформацію про залежності пакунка построково\n" " rdepends - показати інформацію про зворотні залежності пакунка\n" -" pkgnames - показати імена всіх пакунків\n" -" dotty - генерувати граф залежностей пакунків у форматі GraphVis\n" +" pkgnames - показати імена всіх пакунків у системі\n" +" dotty - генерувати граф залежностей пакунків у форматі GraphViz\n" " xvcg - генерувати граф залежностей пакунків у форматі xvcg\n" " policy - показати поточну політику вибору пакунків\n" "\n" @@ -300,7 +311,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -309,33 +320,33 @@ msgstr "Неможливо записати в %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Неможливо визначити версію debconf. Він встановлений?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Список розширень, припустимих для пакунків, занадто довгий" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Помилка обробки течи %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" "Список розширень, припустимих для пакунків з вихідними текстами, занадто " "довгий" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "помилка обробки повного переліку вмісту пакунків (Contents) %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -423,26 +434,26 @@ msgstr "" " -c=? Використати зазначений конфігураційний файл\n" " -o=? Вказати довільний параметр конфігурації" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Збігів не виявлено" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "У групі пакунків '%s' відсутні деякі файли" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД була пошкоджена, файл перейменований в %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB застаріла, намагаюсь оновити %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -450,278 +461,278 @@ msgstr "" "Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-" "ласка видаліть і наново створіть базу." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не вдалося відкрити DB файл %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "В архіві немає поля control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Неможливо одержати курсор" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не вдалося прочитати теку %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неможливо прочитати атрибути %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: Помилки відносяться до файлу" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Не вдалося піти по посиланню %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Не вдалося зробити обхід дерева" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Не вдалося відкрити %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Не вдалося прочитати посилання %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Не вдалося видалити %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не вдалося створити посилання %s на %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "Перевищено ліміт в %s в DeLink.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "В архіві немає поля package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення для %s\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжує %s, а не %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Внутрішня помилка, не можу знайти складову частину %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - не вдалося виділити пам'ять" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Не вдалося відкрити %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Не вдалося прочитати файл перепризначень (override)%s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Невідомий алгоритм стиснення '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC-канал для породженого процесу" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Не вдалося створити FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Не вдалося виконати породжений процес" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Процес-нащадок, що виконує пакування" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Не вдалося створити IPC з породженим процесом" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Не вдалося виконати компресор " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "декомпресор" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Помилка читання під час обчислення MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s в %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Т" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "але він не встановлений" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " чи" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Пакунки, які будуть залишені в незмінному вигляді:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, будуть замінені на більш СТАРІ версії:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -729,150 +740,150 @@ msgstr "" "УВАГА: Ці істотно важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових пакунків, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr " %lu перевстановлено, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu пакунків замінено на старі версії, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено до кінця чи видалено %lu пакунків.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Виправлення залежностей..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " невдача." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Неможливо скоригувати залежності" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Неможливо мінімізувати набір оновлень" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Виконано" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f " "install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "Незадоволені залежності. Спробуйте використати -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Встановити ці пакунки без перевірки [т/Н]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Деякі пакунки неможливо автентифікувати" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутрішня помилка, InstallPackages була викликана з непрацездатними " "пакунками!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Пакунки необхідно видалити, але видалення заборонене." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Неможливо прочитати перелік джерел." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необхідно завантажити %sB/%sB архівів.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необхідно завантажити %sB архівів.\n" -#: cmdline/apt-get.cc:829 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n" -#: cmdline/apt-get.cc:832 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запитане виконання тільки тривіальних операцій, але це не тривіальна " "операція." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Так, робити, як я скажу!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -883,28 +894,28 @@ msgstr "" "Щоб продовжити, введіть фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Перервано." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Т/н]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -912,49 +923,49 @@ msgstr "" "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " "або спробувати повторити запуск з ключем --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing і зміна носія в даний момент не підтримується" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Неможливо виправити втрачені пакунки." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Переривається встановлення." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Помітьте, замість %2$s вибирається %1$s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускається %s - пакунок вже встановлений, і опція upgrade не " "встановлена.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакунок %s не встановлений, тому не може бути видалений\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Встановлено]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Ви повинні явно вказати, який саме ви хочете встановити." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -966,77 +977,121 @@ msgstr "" "Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не " "згаданих в sources.list\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Однак наступні пакунки можуть його замінити:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакунка %s не знайдені кандидати на встановлення" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "Вже встановлена найновіша версія %s.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Реліз '%s' для '%s' не знайдений" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Обрана версія %s (%s) для %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Неможливо заблокувати теку з переліками пакунків" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1435 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" +msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 помилково знищив щось потрібне\n" +"Будь-ласка відправте багрепорт щодо 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 "Наступна інформація можливо допоможе Вам:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1449 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Внутрішня помилка, вирішувач проблем все поламав" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade все поламав" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Не можу знайти пакунок %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1516 +#: 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:1546 +#: cmdline/apt-get.cc:1692 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "але %s буде встановлений" + +#: 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:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1044,7 +1099,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи імені пакунка (або знайдіть інше рішення)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1055,135 +1110,121 @@ msgstr "" "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1569 -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" -"Необхідно відіслати звіт про цю помилку." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Наступна інформація можливо допоможе Вам:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " "розпаковані вихідні тексти\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1191,7 +1232,7 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1200,32 +1241,33 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " "пакунка %s не задовольняє умови" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1240,6 +1282,8 @@ msgid "" " 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" @@ -1255,7 +1299,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1377,25 +1421,29 @@ msgstr "" msgid "Bad default setting!" msgstr "Неправильне значення по замовчуванню!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Для продовження натисніть Ввід." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Чи хочете ви видалити всі завантажені раніше файли .deb" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" "Під час розпакування виникли помилки. Буде продовжено процес налаштування" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "встановлених пакунків. Це може призвести до повторення помилок або" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "виникненню нових через незадоволені залежності. Це нормально," -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1406,192 +1454,192 @@ msgstr "" msgid "Merging available information" msgstr "Об'єднання інформації про доступні пакунки" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Не вдалося створити канали (pipes)" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Не вдалося виконати компресор gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Пошкоджений архів" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Невідомий тип заголовку TAR %u, член %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Невірний підпис архіву" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Неможливо прочитати заголовок \"member\" архіву" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Невірний заголовок \"member\" архіву" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Архів занадто малий" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Не вдалося прочитати заголовки архіву" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 #, fuzzy msgid "DropNode called on still linked node" msgstr "DropNode викликаний для вузла, який ще використовується" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Не вдалося знайти елемент хешу!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 #, fuzzy msgid "Failed to allocate diversion" msgstr "Не вдалося створити diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Внутрішня помилка в AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, fuzzy, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Спроба зміни diversion, %s -> %s і %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, fuzzy, c-format msgid "Double add of diversion %s -> %s" msgstr "Подвійне додавання diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Шлях %s занадто довгий" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Розпакування %s більш ніж один раз" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, fuzzy, c-format msgid "The directory %s is diverted" msgstr "Тека %s входить до переліку diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, fuzzy, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакет пробує писати у diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 #, fuzzy msgid "The diversion path is too long" msgstr "Шлях diversion занадто довгий" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Тека %s замінюється не текою" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 #, fuzzy msgid "Failed to locate node in its hash bucket" msgstr "Не вдалося розмістити вузол у хеші" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Шлях занадто довгий" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, fuzzy, c-format msgid "Overwrite package match with no version for %s" msgstr "Файли заміняються вмістом пакета %s без версії" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, fuzzy, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s перезаписує інший з пакету %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Неможливо прочитати атрибути %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Невдача видалення %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Неможливо створити %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Не вдалося прочитати атрибути %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Теки info і temp повинні бути на тій самій файловій системі" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Читання переліків пакетів" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Невдача зміни до адмінової теки %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Внутрішня помилка отримання назви пакунку" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Читання переліку файлів" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1602,80 +1650,80 @@ msgstr "" "файл, тоді зробіть його пустим і негайно реінсталюйте ту ж саму версію " "пакунка!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Невдача читання list файла %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 #, fuzzy msgid "Internal error getting a node" msgstr "Внутрішня помилка при отриманні Node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, fuzzy, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Не вдалося відкрити файл diversions %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 #, fuzzy msgid "The diversion file is corrupted" msgstr "Файл diversions пошкоджений" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, fuzzy, c-format msgid "Invalid line in the diversion file: %s" msgstr "Невірна лінія в файлі diversions: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 #, fuzzy msgid "Internal error adding a diversion" msgstr "Внутрішня помилка при додаванні diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Кеш пакунків повинен бути ініціалізованим першим" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, fuzzy, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Не вдалося знайти пакунок: заголовок, зсув %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, fuzzy, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Погана секція ConfFile у статусному файлі. Зсув %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, fuzzy, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Помилка обробки MD5. Зсув %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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'" -#: apt-inst/deb/debfile.cc:52 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +#: apt-inst/deb/debfile.cc:50 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "Невірний DEB архів, відсутній член '%s' чи '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Неможливо змінити %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Внутрішня помилка, не можу знайти member" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Не вдалося знайти правильний контрольний (control) файл" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Контрольний файл не можливо обробити" @@ -1696,25 +1744,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Невірний CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: 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 "Не вдалося одержати атрибути" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -1776,7 +1824,7 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Помилка читання" @@ -1788,7 +1836,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Помилка запису" @@ -1844,7 +1892,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1871,59 +1919,59 @@ msgstr "Черга" msgid "Unable to invoke " msgstr "Неможливо викликати " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "З'єднання з %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "З'єднання з %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Не можу знайти IP адрес для %s" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Тимчасова помилка при отриманні IP адреси '%s'" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Не можливо під'єднатися до %s %s:" @@ -1933,36 +1981,36 @@ msgstr "Не можливо під'єднатися до %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Неможливо отримати доступ до keyring: '%s'" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Неможливо виконати '%s' для перевірки підпису, gnupg встановлено?" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Слідуючі підписи були невірними:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1980,437 +2028,464 @@ msgstr "Неможливо відкрити канал (pipe) для %s" msgid "Read error from %s process" msgstr "Помилка читання з процесу %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Очікування на заголовки" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Отримано одну заголовкову лінію понад %u символів" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Невірна лінія заголовку" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сервер відіслав невірний заголовок 'reply'" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Цей HTTP сервер має поламану підтримку 'range'" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Вибір не вдався" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Помилка запису в вихідний файл" -#: methods/http.cc:832 +#: methods/http.cc:833 #, fuzzy msgid "Error writing to file" msgstr "Помилка запису в файл" -#: methods/http.cc:860 +#: methods/http.cc:861 #, fuzzy msgid "Error writing to the file" msgstr "Помилка запису в файл" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Помилка читання з сервера" -#: methods/http.cc:1107 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Не вдалося записати файл %s" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1124 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1215 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Внутрішня помилка" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Неможливо відобразити в пам'яті пустий файл" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неможливо відобразити в пам'яті %lu байт" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Вибір %s не знайдено" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Нерозпізнаваний тип абревіатури: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Відкривається конфігураційний файл %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Лінія %d занадто довга (максимум %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксова помилка %s:%u: Блок починається без назви." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксова помилка %s:%u: спотворений тег" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксова помилка %s:%u: зайві символи після величини" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, fuzzy, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на " "найвищому рівні" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: Включена звідси" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Помилка!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Виконано" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Невідомий параметр '%c' [з %s] командного рядка." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 командного рядка" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Не логічний параметр %s командного рядка" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Параметр %s потребує аргумента." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Параметр %s потребує integer аргумент, але не '%s'" +msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Параметр '%s' занадто довгий" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Незрозумілий вираз %s , спробуйте true чи false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Невірна дія %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Неможливо прочитати атрибути точки монтування %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для читання" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Не можливо відкрити lock файл %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, fuzzy, c-format msgid "Could not get lock %s" msgstr "Не можливо отримати lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікується на %s але його тут немає" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Не можливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Проблема з закриттям файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Проблема з роз'єднанням файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Кеш пакунків пустий" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Файл кешу пакунків пошкоджений" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Файл кешу пакунків має несумісну версію" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT не підтримує систему призначення версій '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кеш пакунків був побудований для іншої архітектури" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Залежності (Depends)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Пре-Залежності (PreDepends)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Пропонує (Suggests)" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Рекомендує" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфлікти" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заміняє (Replaces)" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Застарілі (Obsoletes)" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "Важливі (Important)" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "Необхідні (Required)" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "Стандартні (Standard)" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "Необов'язкові (Optional)" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "Додаткові (Extra)" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Побудова дерева залежностей" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Версії кандидатів" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Ґенерація залежностей" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Об'єднання інформації про доступні пакунки" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Не вдалося відкрити %s" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Не вдалося записати файл %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неможливо обробити файл %s пакунку (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неможливо обробити файл %s пакунку (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Лінія %u занадто довга в переліку джерел %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворена лінія %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2422,12 +2497,12 @@ msgstr "" "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Тип '%s' індексного файлу не підтримується" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2435,7 +2510,7 @@ msgstr "" "Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для " "нього." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2443,181 +2518,210 @@ msgstr "" "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " "пов'язано з зафіксованими пакунками." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Деякі індексні файли не завантажилися, вони були зігноровані або замість них " +"були використані старі версії." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lists тека %spartial відсутня." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Архівна тека %spartial відсутня." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, fuzzy, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Завантажується файл %li з %li (%s залишилось)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Завантажується файл %li з %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не знайдено." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s не стартував коректно" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Система пакування '%s' не підтримується" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Неможливо визначити тип необхідної системи пакування " -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Неможливо прочитати атрибути %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Ви повинні записати певні 'source' посилання в твій sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Невірний запис в preferences файлі, відсутній заголовок Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Не зрозумів тип %s для pin" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Не встановлено пріоритету (або встановлено 0) для pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Кеш має несумісну систему призначення версій" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ви перевищили кількість імен пакунків, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ви перевищили кількість версій, які APT може обробити." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ви перевищили кількість версій, які APT може обробити." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ви перевищили кількість залежностей які APT може обробити." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про файлів " -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження джерельного кешу" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Невідповідність MD5Sum" + +#: apt-pkg/acquire-item.cc:1118 +#, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ID ключа:\n" -#: apt-pkg/acquire-item.cc:753 +#: 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 " @@ -2626,7 +2730,7 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок. (due to missing arch)" -#: apt-pkg/acquire-item.cc:812 +#: 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 " @@ -2635,14 +2739,14 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -2651,7 +2755,7 @@ msgstr "Невідповідність розміру" msgid "Vendor block %s contains no fingerprint" msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2660,47 +2764,59 @@ msgstr "" "Використовується точка монтування CDROM: %s\n" "Монтування CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Ідентифікація.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Записано мітку: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтується CD-ROM..." + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Використовується точка монтування CDROM: %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Демонтується CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Чекаю на диск...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Монтується CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Диск сканується на індексні файли..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Записано мітку: %s \n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Не є вірною назвою, спробуйте ще.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2709,95 +2825,157 @@ msgstr "" "Цей диск зветься: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Копіюються переліки пакунків..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Записується новий перелік джерел\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Перелік джерел для цього диску:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Демонтується CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Записано %i записів.\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Встановлено %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Конфігурація %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Видаляється %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Lists тека %spartial відсутня." + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Підготовка %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Розпакування %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Підготовка до конфігурації %s" -#: apt-pkg/deb/dpkgpm.cc:365 -#, c-format -msgid "Configuring %s" -msgstr "Конфігурація %s" +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "Помилка обробки течи %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Встановлено %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Видаляється %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Видалено %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Підготовка до повного видалення %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %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" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Неможливо накласти латку на файл" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" -#~ msgid "Could not patch file" -#~ 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" +#~ "Необхідно відіслати звіт про цю помилку." + +#, 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" + +#, fuzzy +#~ msgid "openpty failed\n" +#~ msgstr "Вибір не вдався" diff --git a/po/vi.po b/po/vi.po index 268858e..11b419a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,163 +1,171 @@ # Vietnamese Translation for Apt. # This file is put in the public domain. -# Clytie Siddall , 2005, 2006. -# +# Clytie Siddall , 2005, 2006, 2007, 2008. +# msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-09-21 17:16+0930\n" +"POT-Creation-Date: 2009-02-07 21:16+0000\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.6fc1\n" +"X-Generator: LocFactoryEditor 1.8\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chÆ°a có :\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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 "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " msgstr "Tổng số tên gói: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Gói chuẩn: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Gói ảo nguyên chất: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Gói ảo đơn: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Gói ảo hỗn hợp:" +msgstr " Gói ảo hỗn hợp: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Thiếu : " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "Tổng số phiên bản riêng: " +msgstr "Tổng phiên bản riêng: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Tổng mô tả riêng: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "Tổng số phụ thuộc: " +msgstr "Tổng đồ phụ thuộc: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "Tổng số liên quan phiên bản và tập tin: " +msgstr "Tổng liên quan phiên bản và tập tin: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Tổng liên quan mô tả/tập tin: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "Tổng số ảnh xạ Miễn là: " +msgstr "Tổng ảnh xạ Miễn là: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: " +msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Tổng chỗ phiên bản phụ thuộc:" +msgstr "Tổng chỗ phiên bản phụ thuộc: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Tổng chỗ nghỉ:" +msgstr "Tổng chỗ nghỉ: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Tổng chỗ đã tính: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Bạn phải đưa ra đúng một mẫu" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(không tìm thấy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(không có)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ứng cá»­: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Bảng phiên bản:" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" +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:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -180,8 +188,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -195,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" @@ -222,7 +230,7 @@ msgstr "" " depends\tHiện thông tin cách _phụ thuộc_ thô cho gói\n" " rdepends\tHiện thông tin cách _phụ thuộc ngược lại_, cho gói\n" " pkgnames\tHiện danh sách _tên_ mọi _gói_\n" -" dotty\t\tTạo ra đồ thị gói cho GraphVis (_nhiều chấm_)\n" +" dotty\t\tTạo ra đồ thị gói cho GraphViz (_nhiều chấm_)\n" " xvcg\t\tTạo ra đồ thị gói cho _xvcg_\n" " policy\t\tHiển thị các thiết lập _chính thức_\n" "\n" @@ -235,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 @@ -317,7 +325,7 @@ msgstr "" " -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" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -326,31 +334,31 @@ msgstr "Không thể ghi vào %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chÆ°a?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Danh sách mở rộng gói quá dài" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "Gặp lỗi khi xá»­ lý thÆ° mục %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Danh sách mở rộng nguồn quá dài" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Gặp lỗi khi xá»­ lý nội dung %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -446,26 +454,26 @@ msgstr "" " -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 »" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Không có điều đã chọn khớp được" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »." -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "CÆ¡ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cÅ©)." -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "CÆ¡ sở dữ liệu cÅ© nên đang cố nâng cấp lên %s" -#: ftparchive/cachedb.cc:76 +#: 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." @@ -473,278 +481,278 @@ msgstr "" "Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " "apt cÅ©, hãy gỡ bỏ rồi tạo lại co sở dữ liệu này." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Không thể mở tập tin cÆ¡ sở dữ liệu %s: %s." -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: 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 "Việc lấy thông tin toàn bộ cho %s bị lỗi" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Không thể lấy con chạy" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Không thể đọc thÆ° mục %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "E: có lỗi áp dụng vào tập tin " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "Việc quyết định %s bị lỗi" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "Việc di chuyển qua cây bị lỗi" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "Việc mở %s bị lỗi" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " Bỏ liên kết %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "Việc tạo liên kết lại %s bị lỗi" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "Việc bỏ liên kết %s bị lỗi" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Việc liên kết %s đến %s bị lỗi" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cÅ©ng không có mục ghi đè nhị phân\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Điều đè dạng sai %s dòng %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Điều đè dạng sai %s dòng %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Điều đè dạng sai %s dòng %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Việc đọc tập tin đè %s bị lỗi" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Không biết thuật toán nén « %s »" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "Việc tạo tiến trình con bị lỗi" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "Nén điều con" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "Lỗi nội bộ, việc tạo %s bị lỗi" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "Việc thá»±c hiện bô nén bị lỗi " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "bộ giải nén" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "Việc đọc khi tính MD5 bị lỗi" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây phụ thuộc vào phần mềm chÆ°a có :" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "nhÆ°ng mà %s đã được cài đặt" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "nhÆ°ng mà %s sẽ được cài đặt" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "nhÆ°ng mà nó không có khả năng cài đặt" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "nhÆ°ng mà nó là gói ảo" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "nhÆ°ng mà nó chÆ°a được cài đặt" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "nhÆ°ng mà nó sẽ không được cài đặt" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " hay" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "Theo đây có những gói sẽ bị Gá»  BỎ :" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "Theo đây có những gói đã được giữ lại:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "Theo đây có những gói sẽ được nâng cấp:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "Theo đây có những gói sẽ được HẠ CẤP:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "Theo đây có những gói sẽ được thay đổi:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (do %s) " -#: cmdline/apt-get.cc:546 +#: 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!" @@ -752,147 +760,147 @@ msgstr "" "CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n" "ĐỪNG làm nhÆ° thế trừ khi bạn biết làm gì ở đây nó một cách chính xác." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu đã nâng cấp, %lu mới được cài đặt, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "%lu được hạ cấp, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chÆ°a được nâng cấp.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chÆ°a được cài đặt toàn bộ hay được gỡ bỏ.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "Đang sá»­a cách phụ thuộc..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " đã thất bại." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "Không thể sá»­a cách phụ thuộc" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "Không thể cá»±c tiểu hóa bộ nâng cấp" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " Đã xong" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sá»­a hết." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "" "Còn có cách phụ thuộc vào phần mềm chÆ°a có. NhÆ° thế thì bạn hãy cố dùng tùy " "chọn « -f »." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO : không thể xác thá»±c những gói theo đây." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thá»±c bị đè.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thá»±c" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhÆ°ng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chÆ°a xong" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Không thể khóa thÆ° mục tải về" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "Không thể đọc danh sách nguồn." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ... Hai kích cỡ không khớp được. Hãy gởi thÆ° cho " -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB kho.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB kho.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn chÆ°a có đủ sức chức còn rảnh trong %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhÆ°ng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Có, làm đi." -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -903,78 +911,78 @@ msgstr "" "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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 "Việc gói %s bị lỗi %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy " -"cập nhật) hay cố với « --fix-missing » (sá»­a các điều còn thiếu) không?" +"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy cập " +"nhật) hay cố với « --fix-missing » (sá»­a các điều còn thiếu) không?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ChÆ°a hô trợ tùy chọn « --fix-missing » (sá»­a khi thiếu điều) và trao đổi " "phÆ°Æ¡ng tiện." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "Không thể sá»­a những gói còn thiếu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "Đang hủy bỏ cài đặt." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ghi chú : đang chọn %s thay vì %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chÆ°a lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "ChÆ°a cài đặt gói %s nên không thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do :\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -985,83 +993,126 @@ msgstr "" "đã tham chiếu đến nó. Có lẽ có nghÄ©a là gói còn thiếu,\n" "đã trở thành cÅ©, hay chỉ sẵn sàng từ nguồn khác.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó :" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "Gói %s không có ứng cá»­ cài đặt" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mÆ¡i nhất.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành « %s » cho « %s »" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản « %s » cho « %s »" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Không thể khóa thÆ° mục danh sách" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tá»± động" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +"The following packages were automatically installed and are no longer " +"required:" msgstr "" -"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cÅ© được " -"dùng thay thế." +"Theo đây có những gói đã được cài đặt tá»± động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Hãy sá»­ dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." + +#: cmdline/apt-get.cc:1442 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Ừm, có vẻ là Bộ Gỡ bỏ Tá»± động đã hủy cái gì, một trường hợp thá»±c sá»± không " +"nên xảy ra. Hãy thông báo lỗi về 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 "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tá»± động đã làm hÆ° gì." + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Không tìm thấy tác vụ %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" + +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sá»­a hết:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Gói còn phụ thuộc vào phần mềm chÆ°a có. Hãy cố chạy lệnh « apt-get -f " -"install » mà không có gói nào (hoặc ghi rõ cách quyết định)." +"Gói còn phụ thuộc vào phần mềm chÆ°a có. Hãy cố chạy lệnh « apt-get -f install " +"» mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1073,137 +1124,123 @@ msgstr "" "bất định, có lẽ chÆ°a tạo một số gói cần thiết,\n" "hoặc chÆ°a di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1569 -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 "" -"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n" -"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" -"thông báo lỗi về gói này." - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chÆ°a.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1212,31 +1249,31 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "Việc xá»­ lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1251,6 +1288,8 @@ msgid "" " 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" @@ -1266,7 +1305,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1277,7 +1316,7 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Cách sá»­ dụng: apt-get [tùy_chọn...] lệnh\n" +"Sá»­ dụng: apt-get [tùy_chọn...] lệnh\n" " apt-get [tùy_chọn...] install|remove gói1 [gói2 ...]\n" " apt-get [tùy_chọn...] source gói1 [gói2 ...]\n" "\n" @@ -1292,35 +1331,38 @@ msgstr "" "Lệnh:\n" " update\t\tLấy danh sách gói mới (_cập nhật_)\n" " upgrade \t_Nâng cập_ \n" -" install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n" +" install \t\t_Cài đặt_ gói mới (gói có dạng libc6 không phải libc6.deb)\n" " remove \t_Gỡ bỏ_ gói\n" +" autoremove\t\tTá»± động gỡ bỏ tất cả các gói không dùng\n" +" purge\t\tGỡ bỏ và _tẩy_ gói\n" " source \t\tTải về kho _nguồn_\n" -" build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n" +" build-dep \tĐịnh cấu hình _quan hệ phụ thuộc khi xây dụng_, cho gói " +"nguồn\n" " dist-upgrade \t_Nâng cấp bản phân phối_,\n" "\t\t\t\t\thãy xem trang hướng dẫn (man) apt-get(8)\n" " dselect-upgrade \t\tTheo cách chọn dselect (_nâng cấp_)\n" -" clean \t\tXóa bỏ các tập tin kho đã tải về (_làm sạch_)\n" -" autoclean \tXóa bỏ các tập tin kho cÅ© đã tải về (_tá»± động làm sạch_)\n" -" check \t\t_Kiểm chứng_ không có cách phụ thuộc bị ngắt\n" +" clean \t\tXóa các tập tin kho đã tải về (_làm sạch_)\n" +" autoclean \tXóa các tập tin kho cÅ© đã tải về (_tá»± động làm sạch_)\n" +" check \t\t_Kiểm chứng_ không có quan hệ phụ thuộc bị ngắt\n" "\n" "Tùy chọn:\n" " -h \t_Trợ giúp_ này.\n" -" -q \tDữ liệu xuất có thể ghi lÆ°u - không có cái chỉ tiến trình (_im_)\n" +" -q \tDữ liệu xuất có thể ghi lÆ°u - không có cái chỉ tiến hành (_im_)\n" " -qq \tKhông xuất thông tin nào, trừ lỗi (_im im_)\n" " -d \tChỉ _tải về_, ĐỪNG cài đặt hay giải nén kho\n" " -s \tKhông hoạt đông. _Mô phỏng_ sắp xếp\n" " -y \tGiả sá»­ trả lời _Có_ (yes) mọi khi gặp câu hỏi;\n" -"\t\t\t\t\tđừng nhắc người dùng gõ gì\n" -" -f \t\tCố tiếp tục lại nếu việc kiểm tra tính nguyên vẹn _thất bại_\n" -" -m \tCố tiếp tục lại nếu không thể định vị kho\n" +"\t\t\t\t\tđừng nhắc người dùng làm gì\n" +" -f \t\tThá»­ sá»­a chữa một hệ thống có quan hệ phụ thuộc bị ngắt\n" +" -m \tThá»­ tiếp tục lại nếu không thể định vị kho\n" " -u \tCÅ©ng hiện danh sách các gói đã _nâng cấp_\n" " -b \t_Xây dụng_ gói nguồn sau khi lấy nó\n" " -V \tHiện số thứ tá»± _phiên bản chi tiết_\n" -" -c=? \tĐọc tập tin cấu hình ấy\n" -" -o=? \tLập tùy chọn nhiệm ý, v.d. -o dir::cache=/tmp\n" +" -c=? \tĐọc tập tin cấu hình\n" +" -o=? \tLập tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n" "Để tim thông tin và tùy chọn thêm thì hãy xem trang hướng dẫn apt-get(8), " "sources.list(5) và apt.conf(5).\n" -" Trình APT này có năng lá»±c của bò siêu.\n" +" Trình APT này có năng lá»±c của siêu bò.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1393,26 +1435,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Thiết lập mặc định sai." -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Hãy bấm phím Enter để tiếp tục lại." -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Bạn có muốn xoá bất kỳ tập tin .deb đã tải về trước không?" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" "hoặc lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó. Không có sao, " "chỉ những lỗi" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1423,190 +1469,190 @@ msgstr "" msgid "Merging available information" msgstr "Đang hợp nhất các thông tin sẵn sàng..." -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Việc tạo những ống bị lỗi" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Việc thá»±c hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Chữ ký kho không hợp lệ" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Phần đầu bộ phạn kho không hợp lê" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Kho quá ngắn" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Việc đọc phần đầu kho bị lỗi" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Việc định vi phần tá»­ băm bị lỗi" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Việc cấp phát sá»± trệch đi bị lỗi" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Lỗi nội bộ trong AddDiversion (thêm sá»± trệch đi)" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Đang cố ghi đè một sá»± trệch đi, %s → %s và %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Sá»± trệch đi được thêm hai lần %s → %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Tập tin cấu hình trùng %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Việc ghi tập tin %s bị lỗi" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s bị lỗi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Đường dẫn %s quá dài" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Đang giải nén %s nhiều lần" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "ThÆ° mục %s bị trệch hướng" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Đường dẫn trệch đi quá dài." -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ThÆ° mục %s đang được thay thế do điều không phải là thÆ° mục" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Đường dẫn quá dài" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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 "Không thể đọc %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Không thể lấy các thông tin về %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Việc gỡ bỏ %s bị lỗi" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Không thể tạo %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Việc lấy các thông tin về %sinfo bị lỗi" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Những thÆ° mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ " "thống tập tin" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "Đang đọc các danh sách gói..." -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Việc chuyển đổi sang thÆ° mục quản lý %sinfo bị lỗi" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "Gặp lỗi nội bộ khi lấy tên gói" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Đang đọc danh sách tập tin..." -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1616,79 +1662,80 @@ msgstr "" "Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi " "tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Gặp lỗi nội bộ khi lấy nút điểm..." -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Tập tin trệch đi bị hỏng" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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 "Gặp dòng không hợp lệ trong tập tin trệch đi: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Gặp lỗi nội bộ khi thêm một sá»± trệch đi" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Phải khởi động bộ nhớ tạm gói trước hết" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" "Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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 "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »" +"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay « %" +"s »" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "Không thể chuyển đổi sang %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "Tập tin điều khiển không có khả năng phân tách" @@ -1702,39 +1749,38 @@ 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 "" -"Hãy sá»­ dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không " -"thể sá»­ dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới." +"Hãy sá»­ dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không thể " +"sá»­ dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới." #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "CD không đúng" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Không tìm thấy đĩa" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "Việc lấy các thông tin bị lỗi" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Việc lập giờ sá»­a đổi bị lỗi" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Địa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu với « // »" +msgstr "Địa chỉ URI không hợp lệ: URI không thể bắt đầu với « // »" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1790,7 +1836,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1802,7 +1848,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -1856,7 +1902,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1883,59 +1929,59 @@ msgstr "Truy vấn" msgid "Unable to invoke " msgstr "Không thể gọi " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Đang kết nối đến %s (%s)..." -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[Địa chỉ IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "Không thể tháo gỡ « %s »" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "Không thể kết nối đến %s %s:" @@ -1945,34 +1991,34 @@ msgstr "Không thể kết nối đến %s %s:" msgid "Couldn't access keyring: '%s'" msgstr "Không thể truy cập vòng khoá « %s »" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát." -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: chữ ký đúng, nhÆ°ng không thể quyết định vân tay khóa ?!" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Không thể thá»±c hiện « %s » để kiểm chứng chữ ký (gnupg có được cài đặt chÆ°a?)" +"Không thể thá»±c hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chÆ°a?)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi lạ khi thá»±c hiện gpgv" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây là không hợp lệ:\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1989,434 +2035,459 @@ msgstr "Không thể mở ống dẫn cho %s" msgid "Read error from %s process" msgstr "Gặp lỗi đọc từ tiến trình %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Đã lấy một dòng đầu riêng lẻ chứa hÆ¡n %u ky tá»±" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không " "hợp lệ" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không " "hợp lệ" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Lỗi cắt ngắn tập tin" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Gặp lỗi nội bộ" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không nhận biết viết tắt kiểu: « %c »" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "Dòng %d quá dài (tối đa %d)" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: có thể thá»±c hiện chỉ thị chỉ tại mức đầu" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: chÆ°a hỗ trợ chỉ thị « %s »" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Lỗi." -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... Xong" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Không biết tùy chọn dòng lệnh « %c » [từ %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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 "Không hiểu tùy chọn dòng lệnh %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Tùy chọn %s cần đến một đối số." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « = »." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải « %s »" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Tùy chọn « %s » quá dài" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Thao tác không hợp lệ %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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 "Không thể chuyển đổi sang %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhÆ°ng mà chÆ°a gặp nó" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhÆ°ng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhÆ°ng mà không thể" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Bộ nhớ tạm gói rỗng" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Tập tin bộ nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tÆ°Æ¡ng thích" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Phụ thuộc" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Phụ thuộc trước" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Đệ nghị" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Khuyên" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Xung đột" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Thay thế" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Làm cÅ©" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Làm hÆ°" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "quan trọng" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cần" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "chuẩn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "tùy chọn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "thêm" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "Đang xây dụng cây cách phụ thuộc..." -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "Phiên bản ứng cá»­" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "Tạo ra cách phụ thuộc" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Đang đọc thông tin tình trạng" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Lỗi mở tập tin tình trạng StateFile %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tách tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tách tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)" +msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)." +"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)." -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Đang mở %s..." -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2428,18 +2499,18 @@ msgstr "" "bạn thật sá»± muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak " "» (buộc ngắt vòng lặp)." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »" -#: apt-pkg/algorithms.cc:241 +#: 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 "Cần phải cài đặt lại gói %s, nhÆ°ng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2447,188 +2518,211 @@ msgstr "" "Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sá»­a vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/acquire.cc:62 +#: 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 "" +"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cÅ© được " +"dùng thay thế." + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Thiếu thÆ° mục danh sách « %spartial »." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Thiếu thÆ° mục kho « %spartial »." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..." -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" msgstr "Đang lấy tập tin %li trên %li..." -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Không tìm thấy trình điều khiển phÆ°Æ¡ng pháp %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "PhÆ°Æ¡ng pháp %s đã không bắt đầu cho đúng." -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói « %s »" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Không thể lấy các thông tin về %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách " -"nguồn)" +"Bạn phải để một số địa chỉ URI « nguồn » vào « sources.list » (danh sách nguồn)" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái." +msgstr "Không thể phân tích hay mở danh sách gói hay tâp tin trạng thái." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sá»­a các vấn đề này" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package " "(Gói)." -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "ChÆ°a ghi rõ Æ°u tiên (hay số không) cho ghim" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tÆ°Æ¡ng thích" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Gặp lỗi khi xá»­ lý %s (NewPackage - gói mới)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Gặp lỗi khi xá»­ lý %s (UsePackage1 - dùng gói 1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Gặp lỗi khi xá»­ lý %s (NewFileDesc1 - tập tin mô tả mới 1)" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Gặp lỗi khi xá»­ lý %s (UsePackage2 - dùng gói 2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Gặp lỗi khi xá»­ lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Gặp lỗi khi xá»­ lý %s (NewVersion1 - phiên bản mới 1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Gặp lỗi khi xá»­ lý %s (UsePackage3 - dùng gói 3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Gặp lỗi khi xá»­ lý %s (NewVersion2 - phiên ban mới 2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Gặp lỗi khi xá»­ lý %s (NewFileDesc2 - tập tin mô tả mới 2)" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Gặp lỗi khi xá»­ lý %s (FindPkg - tìm gói)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "Gặp lỗi khi xá»­ lý %s (CollectFileProvides - tập hợp các trường hợp miễn là " "một tập tin)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xá»­ lý cách phụ thuộc của/vào tập tin" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lÆ°u bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Sai khớp tổng băm (hash sum)" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2637,7 +2731,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tá»± sá»­a gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2646,7 +2740,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tá»± sá»­a gói " "này." -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2654,7 +2748,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2663,7 +2757,7 @@ msgstr "Kích cỡ không khớp được" msgid "Vendor block %s contains no fingerprint" msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2672,47 +2766,59 @@ msgstr "" "Đang dùng điểm lắp đĩa CD-ROM %s\n" "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "Đang nhận diện... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" +msgid "Stored label: %s\n" msgstr "Nhãn đã lÆ°u : %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang tháo lắp đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "Đang tháo lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "Đang đợi đĩa...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" + +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n" +msgid "Found label '%s'\n" +msgstr "Nhãn đã lÆ°u : « %s »\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "Nó không phải là một tên hợp lệ: hãy thá»­ lại.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2721,99 +2827,131 @@ msgstr "" "Tên đĩa này:\n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "Đang ghi danh sách nguồn mới...\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Đang tháo lắp đĩa CD-ROM..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Đang cài đặt %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Đang cấu hình %s..." + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s..." + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Thiếu thÆ° mục « %s »" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s..." -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s..." -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s..." +msgid "Processing triggers for %s" +msgstr "Đang xá»­ lý các bộ gây nên cho %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 "Đang chuẩn bị gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s..." - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "Không thể ghi lÆ°u, openpty() bị lỗi (« /dev/pts » chÆ°a lắp ?)\n" + #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "Không thể mở tập tin %s" +msgstr "Không thể vá lỗi trong tập tin %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." + +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "Hết chỗ tạo sÆ¡ đồ bộ nhớ động (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 "" +#~ "Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n" +#~ "gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" +#~ "thông báo lỗi về gói này." diff --git a/po/zh_CN.po b/po/zh_CN.po index 46e3ebd..7a141fb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,159 +1,168 @@ # Chinese/Simplified translation of apt. # This file is put in the public domain. -# Tchaikov , 2005. -# Carlos Z.F. Liu , 2004,2006 -# +# Deng Xiyue , 2007, 2008. +# Tchaikov , 2005, 2007. +# Carlos Z.F. Liu , 2004, 2006. +# msgid "" msgstr "" -"Project-Id-Version: apt 0.5.23\n" +"Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-02-22 14:20+1300\n" -"Last-Translator: Carlos Z.F. Liu \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\n" +"PO-Revision-Date: 2008-11-15 00:49+0800\n" +"Last-Translator: Deng Xiyue \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "软件包总数(按名称计)：" +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "软件包名称总数：" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 普通软件包：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 单虚拟软件包：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 缺漏的：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "按版本共计：" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "按不同的说明共计：" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "按依赖关系共计：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "按说明/文件关系共计：" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "提供映射共计：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob 字串共计：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack 空间共计：" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步(sync)。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "您必须明确地给出一个表达式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "没有发现吻合的软件包" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件" -#: cmdline/apt-cache.cc:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "被锁定(pinned)的软件包：" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(没有找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(无)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 候选的软件包：" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " 软件包锁(Pin)：" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s for %s %s ，编译于 %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s for %s 编译于 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -176,8 +185,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -213,7 +222,7 @@ msgstr "" " depends - 原原本本地显示该软件包的依赖信息\n" " rdepends - 显示所有依赖于该软件包的软件包名字\n" " pkgnames - 列出所有软件包的名字\n" -" dotty - 生成可用 GraphVis 处理的软件包关系图\n" +" dotty - 生成可用 GraphViz 处理的软件包关系图\n" " xvcg - 生成可用 xvcg 处理的软件包的关系图\n" " policy - 显示软件包的安装设置状态\n" "\n" @@ -225,7 +234,7 @@ msgstr "" " -i 仅为 unmet 命令显示重要的依赖关系。\n" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -"若要深入了解，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\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'" @@ -300,7 +309,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -309,31 +318,31 @@ msgstr "无法写入 %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "软件包的扩展列表超长" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "源扩展列表超长" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "将 header 写到 contents 文件时出错" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,447 +422,448 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 已过时，现试图进行升级 %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开 DB 文件 %s：%s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "无法读取 %s 的状态" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "存档没有包含控制字段" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "无法获得游标(cursor)" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法对 %s 进行统计\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "错误：" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路径 %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:623 -#, fuzzy, c-format +#: ftparchive/writer.cc:620 +#, c-format msgid " %s has no source override entry\n" -msgstr " %s 中没有 override 项\n" +msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format +#: ftparchive/writer.cc:624 +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s 中没有 override 项\n" +msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" msgstr "内部错误，无法定位包内文件 %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" msgstr "realloc - 无法再分配内存" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "无法打开 %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法建立 %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "无法建立子进程的 IPC 管道" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" msgstr "解压程序" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时，无法读取数据" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" msgstr "在 unlink %s 时出错" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系：" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" msgstr "但却无法安装它" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变：" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级：" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:546 +#: 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 "" -"【警告】：下列的重要软件包将被卸载 \n" +"【警告】：下列的基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列的软件包不能通过验证！" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "内部错误，Ordering 没有完成" +msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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 "无法读取安装源列表。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: 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)操作。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:891 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +874,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,47 +903,47 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "放弃安装。" -#: cmdline/apt-get.cc:1030 +#: 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:1040 +#: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1114 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -944,74 +954,115 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "我们不应该进行删除，无法启动自动删除器" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "下列软件包是自动安装的并且现在不再被使用了：" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 "似乎自动删除器毁掉了一些软件，这不应该发生。请向 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 "下列的信息可能会对解决问题有所帮助：" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "内部错误，自动删除器坏事了" + +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "内部错误，AllUpgrade 坏事了" +msgstr "内部错误，全部升级坏事了" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "无法找到任务 %s" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1516 +#: 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:1546 +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +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”来纠正下列错误：" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1019,7 +1070,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1561 +#: 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" @@ -1030,135 +1081,122 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1569 -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" -"您最好提交一个针对这个软件包的故障报告。" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "下列的信息可能会对解决问题有所帮助：" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1997 +#: 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:2000 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2230 +#: 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:2282 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1167,30 +1205,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1205,6 +1243,8 @@ msgid "" " 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" @@ -1220,7 +1260,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1232,32 +1272,35 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "用法： apt-get [选项] 命令\n" -" apt-get [选项] install|remove 包甲 [包乙 ...]\n" -" apt-get [选项] source 包甲 [包乙 ...]\n" +" apt-get [选项] install|remove 软件包1 [软件包2 ...]\n" +" apt-get [选项] source 软件包1 [软件包2 ...]\n" "\n" "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n" "最常用命令是 update 和 install。\n" "\n" "命令：\n" -" update - 下载更新软件包列表信息\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" +" dselect-upgrade - 根据 dselect 的选择来进行升级\n" " clean - 删除所有已下载的包文件\n" " autoclean - 删除老版本的已下载的包文件\n" " check - 核对以确认系统的依赖关系的完整性\n" +"\n" "选项：\n" " -h 本帮助文档。\n" " -q 让输出可作为日志 - 不显示进度\n" " -qq 除了错误外，什么都不输出\n" " -d 仅仅下载 - 【不】安装或解开包文件\n" " -s 不作实际操作。只是依次模拟执行命令\n" -" -y 对所有询问都作肯定的回答，同时不作任何提示\n" -" -f 当没有通过完整性测试时，程序仍试图继续执行\n" +" -y 对所有询问都回答是(Yes)，同时不作任何提示\n" +" -f 当出现破损的依赖关系时，程序将试图修正系统\n" " -m 当有包文件无法找到时，程序仍试图继续执行\n" " -u 显示已升级的软件包列表\n" " -b 在下载完源码包后，编译生成相应的软件包\n" @@ -1337,24 +1380,28 @@ msgstr "" msgid "Bad default setting!" msgstr "错误的默认设置！" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "按回车键继续。" -#: dselect/install:100 +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "您想要删除之前下载的所有 .deb 文件吗？" + +#: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "在解包时发生了一些错误。我正准备配置" -#: dselect/install:101 +#: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误" -#: dselect/install:102 +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "或一些由于依赖关系不能满足所产生的错误。这个问题不大，只有" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "这个提示之前的错误消息才值得您注意。请更正它们，然后再次执行 [I]nstall" @@ -1363,188 +1410,188 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并现有信息" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar 的校验码不符，包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "无效的打包文件特征号(signature)" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "读取打包文件中的成员文件头出错" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "打包文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "存档太短了" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "无法读取打包文件的数据头" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "把 DropNode 用在了仍在链表中的节点上" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "无法分配散列表项！" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "无法分配转移项(diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "内部错误，出现在 AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "添加了两个转移项(diversion) %s-> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "路径名 %s 过长" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解包了不只一次" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "目录 %s 已被转移(diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "该转移路径(diversion path)过长" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目录 %s 要被一个非目录的文件替换" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "无法在其散列桶(hash bucket)中分配节点" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "路径名过长" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "无法删除 %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "无法创建 %s " -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "无法读取 %sinfo 的状态" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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 "正在读取软件包列表" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "无法切换工作目录到 admin 目录 %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "在获取软件包名字时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "正在读取文件列表" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1554,77 +1601,77 @@ msgstr "" "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上" "重新安装相同版本的这个软件包！" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "获得一个节点时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "无法打开转移配置文件(diversions file) %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "该转移配置文件(diversion file)被损坏了" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "添加 diversion 时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "必须首先初始化软件包缓存" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "无法找到某个软件包：包头，于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "无法解析 MD5 码。文件内偏移量为 %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: 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”" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" msgstr "无法切换工作目录到 %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "内部错误，无法定位包内文件" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" msgstr "无法在打包文件中找到有效的主控文件" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" msgstr "不能解析的主控文件" @@ -1645,26 +1692,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "错误的光盘" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "找不到光盘。" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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 "无法读取状态" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1725,7 +1771,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1737,7 +1783,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@ -1791,7 +1837,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1818,95 +1864,95 @@ msgstr "查询" msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:93 +#: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:108 +#: methods/connect.cc:119 #, c-format msgid "Could not connect to %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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:176 +#: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "解析“%s:%s”时，出现了某些故障 (%i)" -#: methods/connect.cc:223 +#: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "无法解析域名“%s”" +msgstr "无法访问密匙：“%s”" -#: methods/gpgv.cc:100 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" -#: methods/gpgv.cc:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:213 -#, fuzzy, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "用于验证签名(您安装了 gnupg 么？)" +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:256 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1922,427 +1968,452 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1106 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "截断文件失败" + +#: methods/http.cc:1105 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "内部错误" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "没有发现您的所选 %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" - -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:684 +#: 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: 只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: 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: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令行选项“%c”[来自 %s]" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "命令行选项 %s 不是个布尔值" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "选项 %s 要求有一个参数" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: 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：配置项后必须包含有形如“=<变量>”的具体指定" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "选项“%s”超长" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "不能识别参数 %s，请用 true 或 false" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "无效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁%s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "关闭文件时出错" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "同步文件时出错" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "软件包缓存区是空的" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "软件包缓存区文件损坏了" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本程序目前不支持“%s”这个版本控制系统" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的主机构造的" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "破坏" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:151 msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "正在读取状态信息" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "无法打开状态文件 %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "无法写入临时状态文件 %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: 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 行超长了。" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: 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 行的格式有误 (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2353,18 +2424,18 @@ msgstr "" "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" -#: apt-pkg/algorithms.cc:241 +#: 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 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2372,183 +2443,206 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/acquire.cc:62 +#: 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 "" +"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" + +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "软件包列表的目录 %spartial 不见了。" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "找不到“%spartial”这个目录。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: 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:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li" -msgstr "正在读取文件列表" +msgstr "正在下载第 %li 个文件，共 %li 个" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:377 +#: 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”再按回车键。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "无法读取 %s 的状态。" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型(pin type) %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "处理 %s (NewFileDesc1)时出错" + +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %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 "糟了，软件包的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "糟了，软件包说明的数量了超出本程序的处理能力。" + +#: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "Hash 校验和不符" + +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1183 +#: 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 " @@ -2557,7 +2651,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1242 +#: 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 " @@ -2565,13 +2659,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1278 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "大小不符" @@ -2580,7 +2674,7 @@ msgstr "大小不符" msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2589,47 +2683,60 @@ msgstr "" "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " msgstr "正在鉴别.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "存档标签：%s \n" +msgid "Stored label: %s\n" +msgstr "已存档的标签：%s\n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" msgstr "正在光盘中查找索引文件..\n" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" +"名\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "找到标签 '%s'\n" + +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请再次命名。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2638,101 +2745,165 @@ msgstr "" "这张光盘现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是：\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "正在卸载 CD-ROM 文件系统……" - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:263 +#: 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" -#: apt-pkg/indexcopy.cc:266 +#: 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" -#: apt-pkg/indexcopy.cc:269 +#: 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" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "正在安装 %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "正在配置 %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "正在删除 %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "执行安装后执行的触发器 %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "目录 %s 不见了" + +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "正在配置 %s" +msgid "Processing triggers for %s" +msgstr "启动对 %s 的处理" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "正在删除 %s" - -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format msgid "Preparing to completely remove %s" -msgstr "正在准备配置 %s" +msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#: 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 没有 mount 上？)\n" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "无法打开文件 %s" +msgstr "无法打开补丁文件" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "Dynamic MMap ran out of room" +#~ msgstr "动态内存映射(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 "" +#~ "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" +#~ "您最好提交一个针对这个软件包的故障报告。" + +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "第 %d 行超长了(长度限制为 %lu)。" + +#~ msgid "After unpacking %sB of additional disk space will be used.\n" +#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" + +#~ msgid "After unpacking %sB disk space will be freed.\n" +#~ msgstr "解压缩后将会空出 %sB 的空间。\n" + +#~ msgid "%s set to manual installed.\n" +#~ msgstr "%s 已设置为手动安装。\n" + +#~ msgid "Line %d too long (max %d)" +#~ msgstr "第 %d 行超长了(长度限制为 %d)" + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "处理 %s (NewFileDesc1)时出错" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "处理 %s (NewFileDesc2)时出错" + +#~ msgid "Stored label: %s \n" +#~ msgstr "存档标签：%s \n" + +#~ msgid "" +#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" +#~ "i signatures\n" +#~ msgstr "" +#~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n" + +#~ msgid "openpty failed\n" +#~ msgstr "openpty 失败\n" + #~ msgid "File date has changed %s" #~ msgstr "文件 %s 的时间已被改动" diff --git a/po/zh_TW.po b/po/zh_TW.po index b7af225..e952ebd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,153 +8,162 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-26 16:17-0500\n" -"PO-Revision-Date: 2006-10-21 16:58+0800\n" -"Last-Translator: Asho Yeh \n" -"Language-Team: Chinese/Traditional \n" +"POT-Creation-Date: 2009-02-07 21:16+0000\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" -#: cmdline/apt-cache.cc:135 +#: 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: 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:232 -msgid "Total package names : " -msgstr "所有套件的名稱" +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "套件名稱合計：" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " 普通套件：" +msgstr " 一般套件：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " 虛擬套件：" +msgstr " 完全虛擬套件：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " 單虛擬套件：" +msgstr " 單一虛擬套件：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 混合虛擬套件：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " -msgstr " 失蹤：" +msgstr " 找不到：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "所有不同版本" +msgstr "個別版本合計：" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "個別版本類別合計：" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "所有依存關係：" +msgstr "相依關係合計：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "所有版本/檔案關聯：" +msgstr "版本/檔案關聯合計：" + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "類別/檔案關聯合計：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "所有提供套件對應：" +msgstr "提供者對應合計：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Glob 字串共計:" +msgstr "所有字串合計：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "所有相依版本空間:" +msgstr "相依版本空間合計：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Slack 空間共計:" +msgstr "間暇空間合計：" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "所有統計後的空間:" +msgstr "統計後的空間合計：" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: 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:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "您必須給定一完整的樣式" +msgstr "您必須明確得給定一個樣式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "未找到套件" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "套件檔案:" +msgstr "套件檔：" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: 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:1470 +#: 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:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "鎖定的套件:" +msgstr "鎖定的套件：" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(未找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " -msgstr "已安裝:" +msgstr " 已安裝：" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" -msgstr "(沒有)" +msgstr "(無)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " -msgstr " 候選:" +msgstr " 候選：" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " 套件鎖定: " +msgstr " 套件鎖定：" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" -msgstr " 版本表格:" +msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: 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:2575 cmdline/apt-sortpkgs.cc:144 #, c-format -msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -177,8 +186,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -192,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 - 產生 GraphVis 處理的套件關係圖\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 "" @@ -259,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 "" @@ -290,51 +299,51 @@ 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:710 +#: 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:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "套件延伸列表過長" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: 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 "處理目錄 %s 時錯誤" +msgstr "處理目錄 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "原碼的延伸列表太長" +msgstr "原始碼的延伸列表太長" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "寫入標頭資訊到目錄檔案時出錯" +msgstr "寫入標頭資訊到內容檔時發生錯誤" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "處理目錄 %s 時出錯" +msgstr "處理內容 %s 時發生錯誤" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -375,823 +384,849 @@ 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:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "找不到符合的選項" -#: ftparchive/apt-ftparchive.cc:835 +#: 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:47 +#: 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:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB 過舊,嘗試更新 %s" +msgstr "DB 過舊，嘗試升級 %s" -#: ftparchive/cachedb.cc:76 +#: 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:81 +#: 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:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "檔案沒有 control 記錄" +msgstr "套件檔沒有 control 記錄" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "無法取得游標" +msgstr "無法取得遊標" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W:無法讀取目錄 %s\n" +msgstr "警告：無法讀取目錄 %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W:無法取得 %s 狀態\n" +msgstr "警告：無法取得 %s 狀態\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:132 msgid "E: " msgstr "錯誤：" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:134 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E:套用到檔案時出錯" +msgstr "錯誤：套用到檔案時發生錯誤" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "無法解析路徑 %s" +msgstr "無法解析 %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:170 msgid "Tree walking failed" msgstr "無法走訪目錄樹" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " 移除連結 %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "無法讀取符號鏈接 %s" +msgstr "無法讀取連結 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "無法 unlink %s" +msgstr "無法移除連結 %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** 無法將 %s 鏈接到 %s" +msgstr "*** 無法將 %s 連結到 %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "檔案無套件字符" +msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: 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:443 ftparchive/writer.cc:701 +#: 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:623 +#: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s 無原始碼 override 項目\n" +msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:627 +#: 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:317 +#: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "內部錯誤：無法找到成員 %s" +msgstr "內部錯誤，找不找到成員 %s" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - 無法配置記憶體空間" +msgstr "realloc - 無法配置記憶體" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "無法開啟 %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: 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:78 ftparchive/override.cc:182 +#: 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:92 ftparchive/override.cc:195 +#: 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:131 ftparchive/override.cc:205 +#: 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:75 +#: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的壓縮演算法 '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "壓縮輸出 %s 需要一壓縮檔案集合" +msgstr "要壓縮輸出 %s 需搭配壓縮動作" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "無法建立 IPC 管線到子程序" +msgstr "無法和子程序建立 IPC 管線" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" msgstr "無法建立 FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:198 msgid "Failed to fork" msgstr "fork 時失敗" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:212 msgid "Compress child" msgstr "壓縮子程序" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "內部錯誤,無法建立 %s" +msgstr "內部錯誤，無法建立 %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" msgstr "無法建立子程序 IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "無法執行壓縮程序" +msgstr "無法執行壓縮程式" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:360 msgid "decompressor" -msgstr "解壓縮程序" +msgstr "解壓縮程式" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IO 到子程序/檔案失效" +msgstr "和子程序/檔案 IO 失敗" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "在計算 MD5 時無法讀取資料" +msgstr "在計算 MD5 時無法讀取到資料" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "在 unlink %s 時出錯" +msgstr "在取消 %s 的連結時發生問題" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:124 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: 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:237 +#: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "下列的套件有無法滿足的依存關係：" +msgstr "下列的套件有未滿足的相依關係：" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "但是『%s』卻已經安裝好了。" +msgstr "但 %s 卻已安裝" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "但是『%s』卻將被安裝。" +msgstr "但 %s 卻將被安裝" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "但是它卻無法安裝。" +msgstr "但它卻無法安裝" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:342 msgid "but it is a virtual package" -msgstr "但是它只是虛擬的套件" +msgstr "但它是虛擬套件" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "但是『』卻還沒有安裝。" +msgstr "但它卻尚未安裝" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "但是它卻不會被安裝。" +msgstr "但它卻將不會被安裝" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:350 msgid " or" msgstr "或" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列【新】套件將會被安裝：" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "下列的套件都將被【刪除】：" +msgstr "下列套件將會被【移除】：" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "下列的套件都將維持舊版本:" +msgstr "下列套件將會維持其原有版本：" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "下列的套件都將更新:" +msgstr "下列套件將會被升級：" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "下列的套件都將被「降級」:" +msgstr "下列套件將會被【降級】：" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "下列押後的套件都將被更改：" +msgstr "下列被保留 (hold) 的套件將會被更改：" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:542 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: cmdline/apt-get.cc:546 +#: 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 "" -"警告：下列的基本套件都將被移除。\n" -"除非您很清楚在做什麼，請勿輕易嘗試。" +"【警告】：下列的基本套件都將被移除。\n" +"除非您很清楚您在做什麼，否則請勿輕易嘗試！" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" +msgstr "升級 %lu 個，新安裝 %lu 個，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "重新安裝 %lu 個套件，" +msgstr "重新安裝 %lu 個，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "降 %lu 個套件的版，" +msgstr "降級 %lu 個，" -#: cmdline/apt-get.cc:585 +#: 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:589 +#: 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:649 +#: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "更正依存關係中..." +msgstr "正在修正相依關係..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:670 msgid " failed." -msgstr "失敗" +msgstr " 失敗。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "無法更正依存關係。" +msgstr "無法修正相依關係" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "無法最小化升級的套件集合" +msgstr "無法將升級計劃最小化" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:678 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: 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:667 +#: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "無法滿足相依關係。試試看 -f 選項。" +msgstr "未能滿足相依關係。試試 -f 選項。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "警告：下列的套件驗證失敗！" +msgstr "【警告】：無法驗證下列套件！" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "忽略了認證警告。\n" +msgstr "忽略了驗證警告。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "不驗證這些套件就直接安裝？[y/N]" +msgstr "是否不經驗證就安裝這些套件？[y/N]" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "部份套件無法驗證" +msgstr "有部份套件無法驗證" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: 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:755 +#: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！" +msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "有套件需要被移除,但移除動作被禁止。" +msgstr "有套件需要被移除，但卻被禁止移除。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "內部錯誤，Ordering didn't finish" +msgstr "內部錯誤，排序未能完成" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: 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:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: 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:816 +#: 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:821 +#: 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:824 +#: 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:829 +#: cmdline/apt-get.cc:847 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "解壓縮後將消耗 %sB 的空間。\n" +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:850 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "解壓縮後將空出 %sB 的空間。\n" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: 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:849 +#: 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:864 cmdline/apt-get.cc:884 +#: 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:866 +#: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "是的,請執行我所指定的" +msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: 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 "" -"您的操作會導致潛在的危險\n" -"若要繼續的話,就輸入下面的句子“%s”\n" +"您所進行的操作可能會帶來危險。\n" +"請輸入 '%s' 這個句子以繼續進行\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 msgid "Abort." msgstr "放棄執行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " +msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: 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:979 +#: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "部份檔案無法下載" +msgstr "有部份檔案無法下載" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "下載完畢,目前是“僅下載”模式" +msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:986 +#: 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:990 +#: 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:995 +#: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "無法更正遺失的套件。" +msgstr "無法修正欠缺的套件。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1019 msgid "Aborting install." msgstr "放棄安裝。" -#: cmdline/apt-get.cc:1030 +#: 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:1040 +#: 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:1058 +#: 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:1069 +#: 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:1081 +#: cmdline/apt-get.cc:1104 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" -#: cmdline/apt-get.cc:1091 +#: 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 "" -"現在沒有可用的套件 %s,但是它被其它的套件引用了。\n" -"這可能意味著這個套件已經消失或捨棄,\n" -"或者只能在其他原碼中找到\n" +"無法取得套件 %s，但它卻被其它的套件引用了。\n" +"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "但是下列的套件將取代它：" +msgstr "然而，下列的套件取代了它：" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" -msgstr "套件 %s 還沒有可供安裝的候選版本" +msgstr "套件 %s 沒有可安裝的候選版本" -#: cmdline/apt-get.cc:1133 +#: 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:1141 +#: 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:1168 +#: 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:1170 +#: 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:1176 +#: 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:1313 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" + +#: cmdline/apt-get.cc:1435 msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +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 弄壞了什麼東西，而這是不該發生的。\n" +"請針對 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 "以下的資訊或許有助於解決當前的情況：" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +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" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: 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:1516 +#: 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 +msgid "%s set to manually installed.\n" +msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:1546 +#: 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:1549 +#: 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:1561 +#: 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 "" -"有一些套件無法被安裝。這也許是系統無法實現您要求的狀態\n" -"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" -"或從 Incoming 目錄移除。" - -#: cmdline/apt-get.cc:1569 -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" -"的臭蟲報告。" - -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "底下的資訊有助於解決現在的情況:" +"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" +"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列的額外套件將被安裝：" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "建議(Suggested)的套件:" +msgstr "建議套件：" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" -msgstr "推薦(Recommended)的套件:" +msgstr "推薦套件：" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "籌畫升級套件中..." +msgstr "籌備升級中... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: 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:1894 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "必須指定至少一個對應的套件才能下載源碼" +msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: 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:1968 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "略過已被下載的檔案“%s”\n" +msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:1992 +#: 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:1997 +#: 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:2000 +#: 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:2006 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "下載源碼 %s\n" +msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "無法下載某些檔案。" +msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:2065 +#: 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:2077 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "執行解開套件指令 '%s' 時失敗。\n" +msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2078 +#: 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:2095 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "執行建立套件指令 '%s' 時失敗。\n" +msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" -msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" +msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "無法取得 %s 的建構相依關係。" +msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s 無建立相依關係訊息。\n" +msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:2230 +#: 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:2282 +#: 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 "" -"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" -"相依關係" +"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:2317 +#: 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:2342 +#: cmdline/apt-get.cc:2530 #, 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:2356 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "無法滿足套件 %s 所要求的建構相依關係。" +msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2548 msgid "Failed to process build dependencies" -msgstr "無法處理建構相依關係" +msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2580 msgid "Supported modules:" -msgstr "支援模組:" +msgstr "已支援模組：" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2621 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1206,6 +1241,8 @@ msgid "" " 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" @@ -1221,7 +1258,7 @@ msgid "" " -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 continue if the integrity check fails\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" @@ -1232,44 +1269,45 @@ 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" +"指令:\n" +" update - 取得新的套件列表\n" +" upgrade - 進行升級\n" +" install - 安裝新套件（套件名稱是 libc6 而不是 libc6.deb）\n" " remove - 移除套件\n" -" source - 下載源碼檔案\n" -" build-dep - 為源碼配置所需的建構相依關係\n" -" dist-upgrade - 發布版本升級,見 apt-get(8) dselect-upgrade - 根據 " -"dselect \n" -"的選擇來進行升級\n" -" clean - 刪除所有已下載的套件檔案\n" -" auto-clean - 刪除已下載的套件檔案較舊的版本\n" -" check - 核對以確認系統的相依關係的完整性\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" "\n" -"選項:\n" -" -h 本幫助訊息。\n" -" -q 讓輸出作為記錄檔 - 不顯示進度\n" -" -qq 除了錯誤外,什麼都不輸出\n" -" -d 僅下載 - 『不』安裝或解開套件檔案\n" -" -s 不作實際操作。只是模擬執行命令\n" -" -y 對所有詢問都作肯定的回答,同時不作任何提示\n" -" -f 當沒有通過完整性測試時,仍嘗試繼續執行\n" -" -m 當有套件檔案無法找到時,仍嘗試繼續執行\n" +"選項：\n" +" -h 本求助訊息。\n" +" -q 讓輸出可作為記錄檔之用 - 不顯示進度\n" +" -qq 除了錯誤外，不顯示其它資訊\n" +" -d 僅下載 - 【不】安裝或解開套件檔\n" +" -s 不實際進行。只是模擬執行指令\n" +" -y 對所有詢問都回答 Yes，同時不會有任何提示\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" -"以取得更多訊息和選項。\n" -" 本 APT 有著超級牛力。\n" +" -b 在取得套件原始碼後進行編譯\n" +" -V 顯示詳盡的版本號碼\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 msgid "Hit " @@ -1290,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 @@ -1304,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 "" @@ -1325,355 +1363,356 @@ 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:93 -#: dselect/install:104 dselect/update:45 +#: 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:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "解開套件時發生錯誤。我要準備設定" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "您想移除所有先前下載的 .deb 檔嗎？" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" -msgstr "套件已安裝過。這將造成重複性的錯誤" +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "在解開套件時發生錯誤。我要準備設定" #: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "或因為失去相依關係所造成的錯誤。只有該錯誤可被容忍" +msgid "packages that were installed. This may result in duplicate errors" +msgstr "套件已安裝過。這會造成重複錯誤" #: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "或是因為沒有相依關係而造成錯誤。那麼這個錯誤是無關緊要的" + +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" #: dselect/update:30 msgid "Merging available information" -msgstr "結合現有資料中" +msgstr "整合現有的資料" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "損毀的檔案" +msgstr "損毀的套件檔" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar checksum 失敗,檔案已損毀" +msgstr "Tar checksum 失敗，套件檔已損毀" -#: apt-inst/contrib/extracttar.cc:299 +#: 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:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "無效的檔案籤章" +msgstr "無效的套件庫簽章" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "讀取檔案 member 標頭訊息時出錯" +msgstr "讀取套件檔的成員標頭訊息時發生錯誤" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: 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:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "檔案過短" +msgstr "套件檔過短" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "讀取檔案標頭失敗" +msgstr "讀取套件檔標頭失敗" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode 在還有 linked node 時被呼叫" +msgstr "DropNode 在還有連結結點時被呼叫" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "尋找雜湊元件失敗!" +msgstr "找不到雜湊元件！" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "分配轉移(diversion)失敗" +msgstr "在配置轉移資訊時失敗" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "內部錯誤於 AddDiversion" +msgstr "在 AddDiversion 發生了內部錯誤" -#: apt-inst/filelist.cc:481 +#: 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:510 +#: 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:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "路徑 %s 過長" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "解開 %s 超過一次" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "路徑 %s 已被轉向(diverted)" +msgstr "路徑 %s 已被轉移" -#: apt-inst/extract.cc:147 +#: 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:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "轉移(diversion)路徑過長" +msgstr "要進行轉移的路徑過長" -#: apt-inst/extract.cc:243 +#: 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:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "在雜湊表中找不到節點" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "路徑過長" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "複寫套件 %s 無符合版本" +msgstr "以無版本的 %s 覆寫原始套件" -#: apt-inst/extract.cc:434 +#: 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: 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:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "無法讀取 %s 的資料" +msgstr "無法取得 %s 的狀態" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "無法移除 %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: 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:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "無法讀取 %s 的資料" +msgstr "無法取得 %sinfo 的狀態" -#: apt-inst/deb/dpkgdb.cc:123 +#: 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:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: 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:180 +#: 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:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: 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 "內部錯誤，無法取得套件名稱" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "讀取軟件表中" +msgstr "正在讀取檔案清單" -#: apt-inst/deb/dpkgdb.cc:216 +#: 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 "" -"讀取清單檔案「%sinfo/%s」失敗。如果您無法還原此檔案\n" -"請使檔案空白並馬上重新安裝相同版本的套件。" +"無法開啟清單檔 %sinfo/%s。如果您無法將此檔案還原，請清除檔案內容，然後立即重" +"新安裝同一版本的套件！" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: 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:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "內部錯誤，無法取得節點" -#: apt-inst/deb/dpkgdb.cc:309 +#: 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:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "套件轉移檔損壞" +msgstr "轉移檔已損壞" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: 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:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "內部錯誤：新增轉移(diversion)失敗" +msgstr "內部錯誤：在新增轉移資料時發生錯誤" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "套件快取必須先初始化" -#: apt-inst/deb/dpkgdb.cc:443 +#: 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:465 +#: 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:470 +#: 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:42 apt-inst/deb/debfile.cc:47 +#: 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:52 +#: apt-inst/deb/debfile.cc:50 #, c-format -msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "無效的 DEB 檔案，遺失 '%s' 或 '%s' 成員" +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "無法變換目錄至 %s" +msgstr "無法切換至 %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" msgstr "內部錯誤：無法找到成員" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "找不到有效的 control 檔案" +msgstr "找不到可用的 control 檔" -#: apt-inst/deb/debfile.cc:256 +#: 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:164 +#: 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:169 +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "找不到磁碟" +msgstr "找不到磁碟。" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "找不到檔案" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 +#: 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:79 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 +#: 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 @@ -1682,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" @@ -1725,23 +1765,23 @@ msgstr "連線逾時" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "伺服器關閉聯線。" +msgstr "伺服器已關閉連線" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: 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:510 methods/rsh.cc:232 +#: 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" @@ -1749,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" @@ -1773,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" @@ -1791,16 +1831,16 @@ msgstr "Data socket 連線逾時" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "無法允許連線" +msgstr "無法接受連線" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: 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" @@ -1809,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 @@ -1818,101 +1858,101 @@ msgstr "查詢" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "無法讀取 " +msgstr "無法 invoke " -#: methods/connect.cc:64 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "連絡『%s (%s)』中" +msgstr "正和 %s (%s) 連線" -#: methods/connect.cc:71 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: 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:86 +#: 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:93 +#: 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:108 +#: 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:136 methods/rsh.cc:425 +#: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "聯絡主機『%s』中" +msgstr "正連線至 %s" -#: methods/connect.cc:167 +#: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "無法解析位置 %s" +msgstr "無法解析 '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "解析『%s』暫時失敗" +msgstr "暫時無法解析 '%s'" -#: methods/connect.cc:176 +#: 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:223 +#: 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:100 +#: 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:204 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！" +msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:209 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "至少發現一個無效的簽名。" +msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:213 +#: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" -#: methods/gpgv.cc:218 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "執行 gpgv 時發生未知錯誤" +msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:249 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "下列的簽名皆不合法：\n" +msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:256 +#: 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 @@ -1922,708 +1962,772 @@ msgstr "無法開啟管線給 %s 使用" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "從 %s 進程讀取錯誤" +msgstr "由 %s 程序讀取錯誤" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:521 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:529 +#: methods/http.cc:531 msgid "Bad header line" -msgstr "壞的標頭" +msgstr "標頭行錯誤" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "http 伺服器傳送一個無效的回覆標頭" +msgstr "HTTP 伺服器傳送了一個無效的回覆標頭" -#: methods/http.cc:584 +#: 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:599 +#: 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:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "http 伺服器有損毀的範圍支援" +msgstr "這個 HTTP 伺服器的範圍支援有問題" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" -msgstr "Select 失敗" +msgstr "選擇失敗" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" -msgstr "寫入輸出檔時發生錯誤" +msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" -msgstr "寫入檔案時發生錯誤" +msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" -msgstr "寫入檔案時發生錯誤" +msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "從遠端主機讀取錯誤，關閉連線" +msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" -msgstr "從伺服器讀取發生錯誤" +msgstr "在讀取伺服器時發生錯誤" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "無法截短檔案" -#: methods/http.cc:1106 +#: methods/http.cc:1105 msgid "Bad header data" -msgstr "壞的標頭資料" +msgstr "錯誤的標頭資料" -#: methods/http.cc:1123 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1214 +#: methods/http.cc:1229 msgid "Internal error" msgstr "內部錯誤" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "不能將空白檔案讀入記憶體" +msgstr "不能 mmap 空白檔案" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "無法讀入檔案 %lu 位元組至記憶體" +msgstr "無法 mmap 到 %lu 位元組" -#: apt-pkg/contrib/strutl.cc:938 +#: 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 "" +"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。" +"(man 5 apt.conf)" + +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "選項『%s』找不到。" +msgstr "選項 %s 找不到" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "不認識的簡寫類型：%c" +msgstr "無法辨識的縮寫類型：'%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "開啟組態檔 %s" +msgstr "開啟設定檔 %s" -#: apt-pkg/contrib/configuration.cc:512 -#, c-format -msgid "Line %d too long (max %d)" -msgstr "第 %d 行太長（最長 %d）" - -#: apt-pkg/contrib/configuration.cc:608 +#: 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:627 +#: 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:644 +#: 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:684 +#: 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:691 +#: 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:695 apt-pkg/contrib/configuration.cc:700 +#: 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:704 +#: 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:738 +#: 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:155 +#: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 錯誤！" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:80 +#: 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:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: 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" -#: apt-pkg/contrib/cmndline.cc:127 +#: 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:166 apt-pkg/contrib/cmndline.cc:187 +#: 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:201 apt-pkg/contrib/cmndline.cc:207 +#: 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:237 +#: 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:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "選項 %s 太長" -#: apt-pkg/contrib/cmndline.cc:301 +#: 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:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "無效的操作：%s" +msgstr "無效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: 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:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: 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:190 +#: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "CD-ROM 狀況讀取失敗" +msgstr "無法取得 CD-ROM 的狀態" -#: apt-pkg/contrib/fileutl.cc:82 +#: 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:87 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "無法開啟『%s』鎖定檔。" +msgstr "無法開啟鎖定檔 %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: 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:109 +#: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "無法取得『%s』鎖。" +msgstr "無法將 %s 鎖定" -#: apt-pkg/contrib/fileutl.cc:377 +#: 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:387 +#: 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:390 +#: 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:392 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期的結束" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "無法開啟『%s』檔案。" +msgstr "無法開啟檔案 %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: 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:522 +#: 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:597 +#: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "程式關閉檔案" +msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "程式刪除檔案" +msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "程式同步檔案" +msgstr "在同步檔案時發生問題" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "套件暫存檔是空的。" +msgstr "清空套件快取" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "套件暫存檔損壞。" +msgstr "套件快取檔損壞" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "套件暫存檔版本不符合。" +msgstr "套件快取檔版本不符" -#: apt-pkg/pkgcache.cc:142 +#: 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:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "套件暫存檔是在另一種系統上產生的。" +msgstr "這個套件快取是用於另一種平台的" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "依存關係" +msgstr "相依關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "特別依存關係" +msgstr "預先相依關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建議" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推薦" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "衝突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "取代" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "淘汰" +msgstr "廢棄" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "毀損" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "次要" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" -msgstr "添加" +msgstr "額外" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "了解套件依存關係中" +msgstr "正在重建相依關係" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:122 msgid "Candidate versions" msgstr "候選版本" -#: apt-pkg/depcache.cc:91 +#: 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 "正在讀取狀態資料" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "無法開啟 StateFile %s" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %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:193 +#: 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:94 +#: 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:96 +#: 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:99 +#: 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:105 +#: 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:112 +#: 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:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "開啟『%s』中" +msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: 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:240 +#: 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:244 +#: 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:252 apt-pkg/sourcelist.cc:255 +#: 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:402 +#: 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 "" -"此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問" -"題，但您確定的話請啟動『APT::Force-LoopBreak』選項。" +"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" +"若您執意進行，請設定 APT::Force-LoopBreak 選項。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "本軟體不支持『%s』型的索引檔。" +msgstr "不被支援的索引檔類型 '%s'" -#: apt-pkg/algorithms.cc:241 +#: 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:1059 +#: 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:1061 +#: 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 "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." -msgstr "找不到『%spartial』清單目錄。" +msgstr "找不到清單目錄 %spartial。" -#: apt-pkg/acquire.cc:66 +#: 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:823 +#: 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:825 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "正在下載第%li個檔案(共有%li)" +msgstr "正在取得檔案 %li/%li" -#: apt-pkg/acquire-worker.cc:113 +#: 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:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "安裝方式『%s』沒有正確啟動。" +msgstr "安裝方式 %s 沒有正確啟動" -#: apt-pkg/acquire-worker.cc:377 +#: 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:120 +#: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "本軟體不支持『%s』包裝法。" +msgstr "不支援的套件包裝系統 '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "無法明白系統類別。" +msgstr "無法確認合適的套件包裝系統類型" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "無法讀取『%s』的目錄資料。" +msgstr "無法取得 %s 的狀態。" -#: apt-pkg/srcrecords.cc:48 +#: 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:73 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "無法讀取套件清單或狀況檔。" +msgstr "無法分析或開啟套件清單或狀況檔。" -#: apt-pkg/cachefile.cc:77 +#: 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:269 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "喜好檔有錯誤—缺少套件前置檔。" +msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "本軟體不支持『%s』型的版本釘子。" +msgstr "無法分析鎖定類型 %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "對於釘住的檔案無優先順序" +msgstr "銷定並沒有優先順序之分（或零）" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "套件暫存檔使用的是不相容的版本系統。" +msgstr "快取使用的是不相容的版本系統" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "處理『%s』時發生錯誤 (NewPackage)。" +msgstr "在處理 %s 時發生錯誤 (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: 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)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "處理『%s』時發生錯誤 (UsePackage2)。" +msgstr "在處理 %s 時發生錯誤 (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" +msgstr "在處理 %s 時發生錯誤 (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "處理『%s』時發生錯誤 (NewVersion1)。" +msgstr "在處理 %s 時發生錯誤 (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "處理『%s』時發生錯誤 (UsePackage3)。" +msgstr "在處理 %s 時發生錯誤 (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: 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)" -#: apt-pkg/pkgcachegen.cc:207 +#: 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:210 +#: 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 所能處理的說明數量了。" -#: apt-pkg/pkgcachegen.cc:213 +#: 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:241 +#: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "處理『%s』時發生錯誤 (FindPkg)。" +msgstr "在處理 %s 時發生錯誤 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" +msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: 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:574 +#: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "無法讀取來源檔『%s』的目錄資料。" +msgstr "無法取得來源套件列表 %s 的狀態" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "收集檔案供應" +msgstr "正在收集檔案提供者" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "無法寫入來源暫存檔。" +msgstr "在儲存來源快取時 IO 錯誤" -#: apt-pkg/acquire-item.cc:130 +#: 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:410 apt-pkg/acquire-item.cc:660 -#: apt-pkg/acquire-item.cc:1375 +#: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5 檢查碼不符合。" +msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:1070 -#, fuzzy +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +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:1183 +#: 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:1242 +#: 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:1278 +#: 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:1365 +#: 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:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" "使用光碟機掛載點 %s\n" -"掛載光碟機中\n" +"正在掛載光碟機\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " -msgstr "標識中.." +msgstr "正在識別.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Stored label: %s \n" -msgstr "保存標誌：%s \n" +msgid "Stored label: %s\n" +msgstr "保存標籤：%s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸載光碟機...\n" + +#: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" -msgstr "卸載光碟機中\n" +msgstr "正在卸載光碟機\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "等待磁碟中...\n" +msgstr "正在等待碟片...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" -msgstr "掛載光碟機中... \n" +msgstr "正在掛載光碟機... \n" -#: apt-pkg/cdrom.cc:609 +#: 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" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" +msgid "Found label '%s'\n" +msgstr "發現標籤 '%s'\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "這不是合法名稱，重試一下。\n" +msgstr "這並不是正確的名稱，請重試。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" "This disc is called: \n" @@ -2632,107 +2736,132 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "複製套件清單中" +msgstr "正在複製套件清單..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "寫入新的來源列表中\n" +msgstr "正在寫入新的來源列表\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "卸載光碟機中..." - -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:263 +#: 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:266 +#: 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:269 +#: 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 +#, c-format +msgid "Installing %s" +msgstr "正在安裝 %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "正在設定 %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "正在移除 %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "正在執行安裝後套件後續處理程式 %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "找不到 '%s' 目錄" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "準備配置%s中" +msgstr "正在準備 %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" -msgstr "解開%s中" +msgstr "正在解開 %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "準備設定%s檔" +msgstr "正在準備設定 %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format -msgid "Configuring %s" -msgstr "設定%s中" +msgid "Processing triggers for %s" +msgstr "正在後續設定 %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "已安裝%s" +msgstr "已安裝 %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: 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 的刪除操作" - -#: apt-pkg/deb/dpkgpm.cc:372 -#, c-format -msgid "Removing %s" -msgstr "移除%s中" +msgstr "正在準備移除 %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "已移除%s" +msgstr "已移除 %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "準備完整移除 %s" +msgstr "正在準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: 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" #: methods/rred.cc:219 -#, fuzzy msgid "Could not patch file" -msgstr "無法開啟『%s』檔案。" +msgstr "無法修補檔案" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "連線不預期的結束" +msgstr "連線突然終止" + +#~ msgid "Release file expired, ignoring %s (valid until %s)" +#~ msgstr "Release 檔已過期，略過 %s（有效期限 %s）" + +#~ 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 裡沒有區段" -#, fuzzy -#~ msgid "Could not execute " -#~ msgstr "無法取得『%s』鎖。" +#~ msgid "No Hash entry in Release file %s" +#~ msgstr "在 Release 檔 %s 裡沒有 Hash 項目" diff --git a/share/lintian-overrides b/share/lintian-overrides new file mode 100644 index 0000000..49c5ce5 --- /dev/null +++ b/share/lintian-overrides @@ -0,0 +1,3 @@ +# apt-mark is rarely used auxiliary script, we don't want to depend on +# python-apt only for it. +apt binary: python-script-but-no-python-dep ./usr/bin/apt-mark diff --git a/test/fake-status b/test/fake-status new file mode 100644 index 0000000..9e6366d --- /dev/null +++ b/test/fake-status @@ -0,0 +1,16 @@ +Package: libglib2.0-0 +Status: install ok installed +Priority: optional +Section: libs +Installed-Size: 1376 +Maintainer: Ubuntu Desktop Team +Architecture: all +Source: glib2.0 +Version: 2.13.7-1ubuntu1 +Description: The GLib library of C routines + GLib is a library containing many useful C routines for things such + as trees, hashes, lists, and strings. It is a useful general-purpose + C library used by projects such as GTK+, GIMP, and GNOME. + . + This package contains the shared libraries. +Original-Maintainer: Loic Minier diff --git a/test/local-repo/Packages b/test/local-repo/Packages new file mode 100644 index 0000000..fe62fc0 --- /dev/null +++ b/test/local-repo/Packages @@ -0,0 +1,11 @@ +Package: gdebi-test4 +Architecture: all +Version: 1.0 +Conflicts: apt (<= 0.1) +Filename: ./gdebi-test4.deb +Size: 2306 +MD5sum: 0952a2b4a566215e0794c7603f3fcfcc +SHA1: 318688ea2d53352a1bdb669ebd2cd4847f6c4e7c +SHA256: 35f600b57253cef807a1da7c5deb06e7821de9223842a310a77b4da87cf51e2c +Description: testpackage for gdebi - Conflicts: apt (<= 0.1) + diff --git a/test/local-repo/Packages.gz b/test/local-repo/Packages.gz new file mode 100644 index 0000000000000000000000000000000000000000..b5d528435156080de573d436b302d3dd729fa17c GIT binary patch literal 269 zcmV+o0rLJIiwFpw=(E8RD?!EVbU*SXpKP8G~S81!7?N|IPm9Spcri5{1AGB^| zo(3*E!Jg+Sj|J=2w59U9$0sg2dCy+TNK-gBqtu4^MZmhZL)B`kY8nC)^NxabW8 zh&mW+K^hXS*XXQJS!K+K?D)Eu16R^p?RT*t)SOlvTNf5?>bb=t$reaG_7m4;o1aR=vMGYj3$h5iT*Lz0q&9aa55f? zOEnkII_-mx=3*pmf68v1-f3c6zJQMP!qpPjhG0gdwSEQ;aN>9>z~ zpV@^qZKq{;hd85r*Bu((ldS0L2d^JK;5^U}kwU>{W1E6}y)69Lub_^zRu-6Imhe2w z3z1tWtoaJ5gf}{7B!Ylu2deQDpju9CND9I^Qk>8$`vGe zs_MKfk;}A5+qe|6DJoT!Eha+LRa=*BshB39oT%*9{6hsq&-Z|-LB^{?B_Rm6av`#pgV^Di{<7(_)VvseU2pHuhvLZNAlU_oh5 psXIWA-qSS?+A!$2*^S4OrHj*TZs5vLO8h=z>={h{jXtIW008ArE201Z literal 0 HcmV?d00001 diff --git a/test/local-repo/Release b/test/local-repo/Release new file mode 100644 index 0000000..7f206ef --- /dev/null +++ b/test/local-repo/Release @@ -0,0 +1,13 @@ +Date: Thu, 09 Aug 2007 10:13:06 UTC +MD5Sum: + 29f79161fafe1f0c393e7fc6ddcb99b5 338 Packages + 2f885b2ebdb77d3354ba63d8b5aad614 269 Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 Release +SHA1: + d8860d409a8b0db443fbf254e2d6afbfc9bc04a8 338 Packages + 8b668a7b730ceb4d702737a13a723959c20b67df 269 Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release +SHA256: + 39aa9fc59d868a71030d24aeaa4b574d7a11a10ea79491a0881f8d755b36a06d 338 Packages + 62898623498ebf8304647db1ba2d33e4d8ec0e3e45250c2b66907c812b099297 269 Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release diff --git a/test/local-repo/Release.gpg b/test/local-repo/Release.gpg new file mode 100644 index 0000000..e1c3095 --- /dev/null +++ b/test/local-repo/Release.gpg @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBGuui6liSD4VZixzQRApSlAJ9D6G1QXvtXH1jH1I4SStsb1VsImQCbBPfp ++1p0bDANcBVY+GckjJvFRkY= +=a0AR +-----END PGP SIGNATURE----- diff --git a/test/local-repo/gdebi-test4.deb b/test/local-repo/gdebi-test4.deb new file mode 100644 index 0000000000000000000000000000000000000000..9eb92d1b4dd644ce7a25348af15f2a9121953505 GIT binary patch literal 2306 zcmah~X*d*$8lI5Ga3mp18B3PJSQEx}T}}2SW@JfbEQO3LB??81t-)AhY{?SMFjJ9X z?2KKSgzQ_k?2avFZqGUQp6A?O=Y78C{g&r>f4uLXPh1=6?|N4kgO*JtwrCF8#rAB1@mXWVFWGrk!YFRU)05Ek+b-kSo>`P2n8T z5rPrVcfz|n7it|D{)GZ1@A@(W=KB`=e>Wi!SE_u3Zw0Ic`H0FCG8!)#gJV-gns>&> zESXH(8WIvG*dDdrKQPhLfMR6n1-M_nCVZf{R#Qz2yYDDGF;;#%-t;q{B19Totl;-1 z9&`7!Gd|6x$Msl4AQAa3al)jl-+mDtWJ#HWZ_eRfgrz4AZWkT+<9EfK*XUVj1-U<+ z{EhbsK|2p6-2t)y0LTp)i2N&}U;h6oWo3=4nt#UR0{UA@gF#j)o}#BV#C{+CfG0nl zGQ!WwN=%z$B2_6AqqH(0-ZSQ@l)ja!zF0&vL_&fEmLw4xKy)dEH35wptx!PxTZz&y zjRxtwS<>qTP)Coo-N1!*Io0)r#J%8&t)9B=pE}#2Jc!Cf?we6G)FjqOTVQ{FUs8}) zztB&Ei@k9MkvD5sqNE|P3%;*4!xzPkX<>;p@MJF6?opX~QI!T_ShgE_Axt~RpWesU zXObEg^@LBdCIQ$nQB5aGnc#7CC`d=_QOWMID6rs@{2OsKkPa_5Ml$&>A8$Ol-JxX~ za6|wTJAw$$Ta-7z$seqN`cSddhjF4IEF=drL#r=8hYCL}=6w~B@;=^BEwe$bF+5x% z+3op)o2(8$VvdzMp*BU<{8L`sX`=FE;@hMmE%5#=R9)E7K``QHA?Y#0BqSMa4VB)*>>PqFG0z%sz3??xOYyD2QsYPiAyKwoLVd;zl}9?tGW2pueIy~LT9( zmM(}6!kq5mx@{aw&H4tlBb)Wx55w^3ZghDCMnSV_wcz$01`kj*vgv)Im4$WKYzq7ZPU@B82)h3OCy5p~_I4lXDdqv^r)4tj43V2=obW-pLMsEA@ zhO`EbJZy$vti|5gzMFeJ);1BhzrP>Bf_69|qwp++2Mn%;d1tibDy^@24E2cqaA>jU zw%IJ8@m|nDDf*lQ1n-#>jI}`-8lCAcaz9u&<$4*%9{UpuXf9C(261ZB>HT%SwFbO4HIhTuay&@ZbcJqy!xov}SnU*a zx5I7F3-9ziqARj;u4b>m>vW^fje{bl=ABy1i?NPaxy&xR-xi0Ky82AYkEuI7{M<$& zj)GbQ$gUHf@f~+>y50|Y?Ip)#5kx-e454Yce_DD}F3y^L&YaqF74m+h&aqJJs{rK*)=yQwYIHkAiSUiy zEY~un9Z6hUZO-QH9%kYN=6ZKH-^1T4nFmL-hF_y-7n2!vL}O+jBx1IhtXs^XGPlT6 zVF8Q)_1ZmOPv{Ic+l1AXcZM2k8-X&=k8y^*?irAVk$lk)y!`Hceyy*`9Xb_|%H8}u zKE-K2Tfog1;eq+k{JiEa#PQ5wOY^j)&l$H!^$hOV^2(NA+HLCi_z5m{OtXvJv#h}y zsM$3+!xdZ#&3C9M#{m97RJ>BdZ#j z;dC;Oxcf?4Ef3{tp~{^p_={am!m2riA#>FDGqOquUVWZZQ?d`_Nr@qye!nql-Ho61 zLHnJ(ax;=j!>s8B!xRgoPkUfFG!Z84kl3N)7|!jJ2(A%cpfDW9R;OYC`k1CDF{p|q zQx57m70x&KTSh#&U#3@8e}3(%a?&Vt`^i&kkn@CUPx^9t`1P|?BPzBXQqzOeoxTh{ zloMFlTPRkcKPf&)!Ojwjm#kBY{Bf_sbdB(5L&Tk;c{rq~EQAagZS+9syL+h%04S$i z?==>GG)tY z*J#FdVox?%!eKOJ-V0O0MhssycEmBk#Y^58VY zL;J>Ie`jlJK~td8UN9-a`mDBfGDqJ$=@nBV!2sJ(k9m>2SyK0;+%?$Jb-Uz?rX*En zE@8m;2XQr(T;~`%H^9%yR-VZk&^CZZZSZuf9Xh95A{Wj|nfA@K$|KwxI;BC%)$*J6PWLs)S zzl)SfZ+Sk|cmQam&I;`fdYbd|oBiVqj)tXHT4@t(5EMVr4q#(>rZ2_={J+*g+X)ib KRrLMiC;tbP2vD5> literal 0 HcmV?d00001 diff --git a/test/networkless-install-fixes/README b/test/networkless-install-fixes/README new file mode 100644 index 0000000..e7ee2b0 --- /dev/null +++ b/test/networkless-install-fixes/README @@ -0,0 +1,5 @@ + +Those tests aim at making the networkless install timeout +quicker, see +https://wiki.ubuntu.com/NetworklessInstallationFixes +for details diff --git a/test/networkless-install-fixes/sources.test.list b/test/networkless-install-fixes/sources.test.list new file mode 100644 index 0000000..380e180 --- /dev/null +++ b/test/networkless-install-fixes/sources.test.list @@ -0,0 +1,25 @@ + +# archive.ubuntu.com +deb http://archive.ubuntu.com/ubuntu/ hardy main restricted +deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted + +deb http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted +deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates main restricted + +deb http://archive.ubuntu.com/ubuntu/ hardy universe +deb-src http://archive.ubuntu.com/ubuntu/ hardy universe + +deb http://archive.ubuntu.com/ubuntu/ hardy-updates universe +deb-src http://archive.ubuntu.com/ubuntu/ hardy-updates universe + +# security.ubuntu.com +deb http://security.ubuntu.com/ubuntu/ hardy-security main restricted +deb-src http://security.ubuntu.com/ubuntu/ hardy-security main restricted + +deb http://security.ubuntu.com/ubuntu/ hardy-security universe +deb-src http://security.ubuntu.com/ubuntu/ hardy-security universe + + +# archive.canonical.com +deb http://archive.canonical.com/ubuntu/ hardy-partner universe +deb-src http://archive.canonical.com/ubuntu/ hardy-partner universe diff --git a/test/networkless-install-fixes/test.sh b/test/networkless-install-fixes/test.sh new file mode 100755 index 0000000..809d467 --- /dev/null +++ b/test/networkless-install-fixes/test.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +OPTS="-o Dir::Etc::sourcelist=./sources.test.list -o Acquire::http::timeout=20" + +# setup +unset http_proxy +iptables --flush + +echo "No network at all" +ifdown eth0 +time apt-get update $OPTS 2>&1 |grep system +ifup eth0 +echo "" + +echo "no working DNS (port 53 DROP)" +iptables -A OUTPUT -p udp --dport 53 -j DROP +time apt-get update $OPTS 2>&1 |grep system +iptables --flush +echo "" + +echo "DNS but no access to archive.ubuntu.com (port 80 DROP)" +iptables -A OUTPUT -p tcp --dport 80 -j DROP +time apt-get update $OPTS 2>&1 |grep system +iptables --flush +echo "" diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py new file mode 100755 index 0000000..268b3d6 --- /dev/null +++ b/test/pre-upload-check.py @@ -0,0 +1,154 @@ +#!/usr/bin/python + +import sys +import os +import glob +import os.path +from subprocess import call, PIPE + +import unittest + +stdout = os.open("/dev/null",0) #sys.stdout +stderr = os.open("/dev/null",0) # sys.stderr + +apt_args = [] # ["-o","Debug::pkgAcquire::Auth=true"] + + +class testAuthentication(unittest.TestCase): + """ + test if the authentication is working, the repository + of the test-data can be found here: + bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/ + """ + + # some class wide data + apt = "apt-get" + pkg = "libglib2.0-data" + pkgver = "2.13.6-1ubuntu1" + pkgpath = "/var/cache/apt/archives/libglib2.0-data_2.13.6-1ubuntu1_all.deb" + + def setUp(self): + for f in glob.glob("testkeys/*,key"): + call(["apt-key", "add", f], stdout=stdout, stderr=stderr) + + def _cleanup(self): + " make sure we get new lists and no i-m-s " + call(["rm","-f", "/var/lib/apt/lists/*"]) + if os.path.exists(self.pkgpath): + os.unlink(self.pkgpath) + + def _expectedRes(self, resultstr): + if resultstr == 'ok': + return 0 + elif resultstr == 'broken': + return 100 + + + def testPackages(self): + for f in glob.glob("testsources.list/sources.list*package*"): + self._cleanup() + (prefix, testtype, result) = f.split("-") + expected_res = self._expectedRes(result) + # update first + call([self.apt,"update", + "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args, + stdout=stdout, stderr=stderr) + # then get the pkg + cmd = ["install", "-y", "-d", "--reinstall", + "%s=%s" % (self.pkg, self.pkgver), + "-o","Dir::state::Status=./fake-status"] + res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args, + stdout=stdout, stderr=stderr) + self.assert_(res == expected_res, + "test '%s' failed (got %s expected %s" % (f,res,expected_res)) + + + def testGPG(self): + for f in glob.glob("testsources.list/sources.list*gpg*"): + self._cleanup() + (prefix, testtype, result) = f.split("-") + expected_res = self._expectedRes(result) + # update first + call([self.apt,"update", + "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args, + stdout=stdout, stderr=stderr) + cmd = ["install", "-y", "-d", "--reinstall", + "%s=%s" % (self.pkg, self.pkgver), + "-o","Dir::state::Status=./fake-status"] + res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+ + cmd+apt_args, + stdout=stdout, stderr=stderr) + self.assert_(res == expected_res, + "test '%s' failed (got %s expected %s" % (f,res,expected_res)) + + def testRelease(self): + for f in glob.glob("testsources.list/sources.list*release*"): + self._cleanup() + (prefix, testtype, result) = f.split("-") + expected_res = self._expectedRes(result) + cmd = ["update"] + res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args, + stdout=stdout, stderr=stderr) + self.assert_(res == expected_res, + "test '%s' failed (got %s expected %s" % (f,res,expected_res)) + if expected_res == 0: + self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, + "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) + + +class testLocalRepositories(unittest.TestCase): + " test local repository regressions " + + repo_dir = "local-repo" + apt = "apt-get" + pkg = "gdebi-test4" + + def setUp(self): + self.repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir)) + self.sources = os.path.join(self.repo, "sources.list") + s = open(self.sources,"w") + s.write("deb file://%s/ /\n" % self.repo) + s.close() + + def testLocalRepoAuth(self): + # two times to get at least one i-m-s hit + for i in range(2): + self.assert_(os.path.exists(self.sources)) + cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % self.sources]+apt_args + res = call(cmd, stdout=stdout, stderr=stderr) + self.assertEqual(res, 0, "local repo test failed") + self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")), + "Packages.gz vanished from local repo") + + def testInstallFromLocalRepo(self): + apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args + cmd = apt+["update"] + res = call(cmd, stdout=stdout, stderr=stderr) + self.assertEqual(res, 0) + res = call(apt+["-y","install","--reinstall",self.pkg], + stdout=stdout, stderr=stderr) + self.assert_(res == 0, + "installing %s failed (got %s)" % (self.pkg, res)) + res = call(apt+["-y","remove",self.pkg], + stdout=stdout, stderr=stderr) + self.assert_(res == 0, + "removing %s failed (got %s)" % (self.pkg, res)) + + def testPythonAptInLocalRepo(self): + import apt, apt_pkg + apt_pkg.Config.Set("Dir::Etc::sourcelist",self.sources) + cache = apt.Cache() + cache.update() + pkg = cache["apt"] + self.assert_(pkg.name == 'apt') + + + +if __name__ == "__main__": + print "Runing simple testsuit on current apt-get and libapt" + if len(sys.argv) > 1 and sys.argv[1] == "-v": + stdout = sys.stdout + stderr = sys.stderr + unittest.main() + + diff --git a/test/testkeys/mvo.key b/test/testkeys/mvo.key new file mode 100644 index 0000000..e1ab501 --- /dev/null +++ b/test/testkeys/mvo.key @@ -0,0 +1,1182 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.6 (GNU/Linux) + +mQGiBDgbNk0RBACbHfepY/RojAOL0tqkJOLnJ0ppvoAcFj427ZxdUbEwdwc7BNL+ +XtRgZ1WBURA+qb2inC3rA9a9TrQA2x2luq7XmCVbP7jv0K/8nYqzSHp0oPuMsrCO +6EhK/XLOzKw7Bk1rfl4JVOX92QFBXodJiaemUok29CXVSn8vUR2lqGdypwCgpiBJ +zxjf/eSvPp4IihsTC3kke9ED/2ASOhlkfWobIaed47/ehIYc9gvbdMOnoGDrwXN6 +8ba+3FGvtY5qbUKg2HinOYQoBjXW9NDjeJ6b8klpyG2LMAhS2UzPQjhwUIn9WnNX +Qsvreq0e3ad+kXCjPFjtfjCPno19mPvTSevLEXIUoG02fjpDdHTCxlUq7jdthtPC +TMCLA/4scIFi2Ll7pqVvNqc7xTLb/b5E9fKsiqdrJMLGqg4cWak84e9UF2tQmsqs +UohiU9qV5u4HIehraXs9NDdt2PvFgCsEYNtwFdSCsq6q9YtqfgnGia1hyQLE47RP +J+AwLeZRU9R81gKslD/ouxgj3ctx44hHMtLAFEZU/SqoD6CZBbQcTWljaGFlbCBW +b2d0IDxtdm9ndEBhY20ub3JnPohVBBMRAgAVBQI4GzZNAwsKAwMVAwIDFgIBAheA +AAoJEJYkg+FWYsc0Da0AoJL3vvvHdGlRzVKRBUmUk7ldSaeOAJwJx+M17RtS2H7/ +rtDs/FdKgOpyYIhGBBARAgAGBQI44PQGAAoJEHnZRpQA4NBUcfsAnjJyH2KDaapk +LmWIo8mXbjKkp1nPAJ0ah73TIyMDX46M5keCVv14rEO7qIhGBBARAgAGBQI5XewC +AAoJEG9cFK2bBJM1u2MAnRm2g0rv3MJcp0+WqJ6gBwFusJLGAJ44gsM1etFK+/v5 +K7fhtTVHVw2p5ohGBBARAgAGBQI5YbDGAAoJENfxTmPdHGLWOx0AniI3REj/jKDw +rlLox+UMytalnzKcAJ9ymd5/mwd2Vv5xgZpOzlzmOkHM24hGBBARAgAGBQI5czP9 +AAoJEFTCT7U7C7mpbogAmwc+jjRJAQLuwP8AY4oEf6G5MAErAKDIGv+gNkcZM66T +whLZdmF+SUYcEIhGBBARAgAGBQI5ye0MAAoJEFGs9q11voCXz5IAnivGxujJtmUl +9qOu2j542xIpFOcLAJ4/IeHXf0Z4UknuqDDRuEK8iLsAfYhGBBARAgAGBQI5yy+C +AAoJEL/hIGVrIUiaJXYAnjwaPF3bh7P0SBNlD+wLjtQJ/MTHAJ9Y3WWJKMYUg4xL +F0tHLZyloU9674hGBBARAgAGBQI5zN/1AAoJEN56r26UwJx/QdIAoMfkJQVmLGmZ +zHOxLMb/EtMGUF1ZAKCMwdQnb1x9ilkIzr5NtNUE/TErJ4hGBBARAgAGBQI51EyZ +AAoJEPhev0YljYeBAhoAn3wxgOQeBwbCkJyLicdOrzy23Cv/AJ0UTreo2KaFOfcy +eqdxDSZpt//2hIhGBBARAgAGBQI6Ac4jAAoJEB/Egc/tDXz6yeoAn1lqYvC91uvt +JmbJ1mPgWOL8BRlLAJ9zSXAy/Evl7ffMmNRmw68hgiw+uYhGBBARAgAGBQI6Lj7J +AAoJENwT5U6rm2b9hyUAoNKrqr+wFKb53a/2EiqiwlxwMe9sAJ4rmmdg/eD7+gra +taOyc9hbc9BsIYhGBBARAgAGBQI7QFC3AAoJEHkWLzb39qrZmlcAoKcsJvgM2fLl +msslzS5C0wPmHp2aAJ9GwhzCzA5m2sfHF//VE9vK7lGP6ohGBBARAgAGBQI7QK1g +AAoJECm+XSJo/VSf9RMAoKeZR763sZs1FUzDZqO+1P1PvRORAJ4/pPOXrBtUVxtP +L7JYcby7Pu2q4ohGBBARAgAGBQI7QEqKAAoJEHzz9a8pSZ9h/LoAnjq3tepe77aC +7A87N4m8ioQNq9EWAJ4r8xJdSV9WJuKOpWO8RhcQK+zG8IhGBBARAgAGBQI7Rdfh +AAoJEENVU8Xg+cY0XsEAoJYuY/GAwj3D3O2l2/4kpqL/K2bOAKCVFnIXGzmokhUW +OzEpR9zISB0Jl4hGBBARAgAGBQI7QVVlAAoJENdZXTdLcpYl3IwAnjJg1r1c8SdB +pmCusQhdlvth9KanAJ4oVB5ClSpXLszX81n3K14E4xgSz4hGBBARAgAGBQI7RsZj +AAoJEPIPrAt7g1flwMgAoKif05sqy6lgnhOOW0gen5ZDMZiDAJ4lZrdd+We/lzOI +ItzwaH7MtR7mnohGBBARAgAGBQI7MdbOAAoJEIuYyKIb5v0ldf0AnRNFMcbfelX1 +kWyQ7iwBe8ZdrnBSAJ9XAYyd+YDMxRPgUjPsx5g4bVoByIhGBBARAgAGBQI7SxV6 +AAoJEMCky7mHl4VpMpAAnAiPDNzcAqS3SitNzdfo6um6ULm3AJ45Arkvwdt1rhe+ +XdJb8BmE0csV24hGBBARAgAGBQI7TWOqAAoJEP6aHsNkhDkzNo4AoIG4qZnmAhiu +tjYUGe8iTHvlSRn2AJ0R78A+6pNYq7bXsX+u2wQCmtKstIhGBBARAgAGBQI7TyYG +AAoJEF3iSZZbA1iijrIAmQFyBc06cpHnk8Z1jcb1j4hppKDTAKCrOAVms47hOwSQ +kx77XYYVmgv1JYhGBBARAgAGBQI7UiYzAAoJECTpnxDbPUTUOs4AoKxun2wYzw6n +X8m2GD852Fvl1ejRAKCcxxsM91CEqa1Dq1ZgSAPcPW4aFohGBBARAgAGBQI7Ur/6 +AAoJEPHSzMhJehdttqIAoLlQ8CR3oGaSFhnJUJlhITxph2AcAKC/D8KE2TBBH9Ns +Xnd9w4TueW5ZwIhGBBARAgAGBQI7XvRyAAoJEKXycCgJF6nkbZIAn0a/QJMxWZA1 +joLAmTZeZKtpG4kBAJ9HmXc4IvbtywrkN2UUXy6V9EBdmohGBBARAgAGBQI8Bm3x +AAoJEG+rq7w1fSF4VpIAn2FRhND2RaEf7OzAHuijY51SxYRfAJ0bHBGbLKfiV9GN +h+8ZeIU4G/ZoF4hGBBARAgAGBQI7+t0uAAoJEO/OC2AEJW07bwUAnRx8jfjEQvV+ +didBZ6royl+EQ+XIAKCEaXBmCylJjiDzzwFs2M6ofr7oiIkAlQMFEDweVsmABi58 +5NR+wQEB14gEAN2PQAo2JeKKw5Ehq5MtNncwAnY8f4k9vMR+bRF+ZQZRSENDseEi +1NFe0L36ftZm+OPycd6sOW+ItdBQdz5Klg0itVPlneg6e172S97rBC3H9Sadc/s2 +e3TzSO75H17SZQqep8SQ0J5lpVqnZWv8UInw6nlNHrAZnKi5vDCDg2qViEYEEBEC +AAYFAjtSxtsACgkQO/YJxouvzb1UngCfVU4Tuak2dZvqi3sGpEbP5N3JD6YAoMC/ +O5omvvNn+Y3roJ9DO9Gp5tuGiEYEEBECAAYFAjwea0EACgkQw3ao2vG823MD+wCf +QMu34w5+e1IVv0SG/4u7OZ+gAU0An14HokAASyR08zx6YWRISe+ut2ugiEYEEBEC +AAYFAjzOpm0ACgkQYFIoXKh32XgWBACgmj2D12AxjkIKtSAnxaJW0jctpPAAn3gD +BekKLQ6nxUv/RtdSxgEuJaTziEYEEBECAAYFAjwaQVoACgkQArxCt0PiXR4VogCg +4Ugp24rAWDTrg087qmJJDSzoFMoAniSj+0jFBN7+Cuxt6lvsYdzIZtRkiEYEExEC +AAYFAj03JCAACgkQEmi4KLr+iOXtmACgpOsak4ZO2xpL+BWtsV0STUiHWa0An1MO ++j7+1i/qyUqxK3dBMAAQR6DciEYEEBECAAYFAjz8wDsACgkQL0uj7/chxkPnawCf +fe9U7VuB6Kmb8kCOuqLD2WdeQ5QAoKdNllTKuajMNuTKu7nK4cM5xwasiEYEEBEC +AAYFAjz/WjsACgkQ4ggFW0tm2ZF8AACfRKZqobRP7Rz/nMmmjQTicKKRcikAn2ki +Uout5ll4H8kJSN0xvQtwV/AtiEYEEBECAAYFAjy8heYACgkQ+FmQsCSK63M7qwCf +XWEy22x1vjjEwqLKfcbfE/KUFYIAni6HE23kn69qjF9JIIHEwUaLO1JJiEYEEhEC +AAYFAj2hjGkACgkQjjtznt0rzJ2LKQCdGrZeo3TW4KOL13MlTNst0njtV18An3h9 +6nXE3Hz9THRMuxldBfhrPbk/iEYEEBECAAYFAj44b8oACgkQ/5gPV7u/uOHgDwCg ++VNQMCgxFaNiiyU1c6uppxDRYcIAn27PkEgAjlw0t6xHGSqSUelJONBEiQFABBMB +AgAqBQI+jbNtIxpodHRwOi8vd3d3LnJhdGgub3JnL2dwZ3BvbGljeS5odG1sAAoJ +ELbcsCzNGlK5XZYIAKlU2bdFlD90ss50fUi2+sUus7ev3nhPP9VPuN5IO325meNF +OJN/074ewSHsdiD0323sohtqe4aQp0nieYg3IfC6agEiCiNffFmvs/oMuZKk0OXy +BBZP3KxHUnz6B0eHN1HxdfrWO3Zt48T4cLEs2cudZHfGnzd/ZsPbxlMe+krHktgl +FZdX2pm8g77NMD/FHICbypCsY2FLt7huw/pPcLyvE8Wafm8YmgM6biWR5CUglVfs +IoeKzEdYj/Ys0rht7YGz5yB1U6Sy4JRLDbM1Msx3h2C2J76mV/oogt568okZSGZx +EadrBn4PdJqU4zFK4t9Y0Pp6imFpraOAOaG0jvWIRgQTEQIABgUCPpGDpwAKCRAI +XykZwmr06+IRAJ9yHo51a6Swdm2MzcE8NM3AiVZDAACeJPI2DzeXqckHrFmVhMm8 +WSUQcNqIagQTEQIAKgUCPo2ymCMaaHR0cDovL3d3dy5yYXRoLm9yZy9ncGdwb2xp +Y3kuaHRtbAAKCRCprbf4rk5CXMabAJ9ewWNvXylfEGFtSEl/Akp5HmlcQwCguezW +D8hrg9b7grq+D8Xa+qhVzoqIRgQTEQIABgUCPw/vagAKCRDTW7yZvH0CCo6oAJ41 +fNnL1AS8lMN4xxVoBudfnj0ENQCZARDKiW3eMp2+bLHKOcaMCF5GEHeIRgQQEQIA +BgUCPxBWNAAKCRDW+vrdlS8//wK4AKCsH7xA5MH6ctCKrLqFgJVminkaigCfUyan +WP6QtCkyC8x+wlEAN8g7g6uJARwEEwEBAAYFAj8RBnoACgkQQAYVDkAJ6u1KcAgA +tSn2vpDSge72G8+oCQrhxcDpob0l33IuBXEFqczV2TO7oUisgiu+/90GeRzUqBvE +jxg2uX0n+2uYInPbLL0m5rlWgkhyk5tWSdklDz3JLKSK24p48xBjDsAxL8eiYVJh +HOUrHRIl5imsgRk8Aycey1/h2CfweIrIZHDxGRqtX/I8EO5rG2O/HV3nujPSli6G +wPlf1aXlV9diPj0mwU5HlCFAB/Akfx8jzcMLbORGYM1fift2c01P/KLTr9szJ8iz +2UDiNCM007CPwrYS8aAw373zOBhzZnrJLTP7hXl78UYjZWTJlDP1PYWYY5P4gq96 +djvXpDH2WiRgF56LAEg4pYhGBBMRAgAGBQI/ECvMAAoJELM00wiWL9Le93YAnR+n +8c2tFDeBHcSTIfjRfWjFi0ixAJwJARGAeBLHzHfHfcf15FanE4GPVIhGBBMRAgAG +BQI/ERPwAAoJEOGFItd8cSvLEpAAnjQ1MpPXRtTKmO9OsMVGLWAe+2I7AJ4zV1mS +zJGkkFA77QnFy4X0lP5SjYkBHAQQAQIABgUCPxFKTgAKCRAJ6fkKinJORY7SCADB +UjR1STWfr5rXFjFleiSwPdOFMFj1HJvMVirY9ah2gzz6R+WEkzBesrg8X+Zrgf1D +UrodM/Uas57Ght3t/ytKJdjfPiCcpn9rcWk7Gy5idpBgpGJD2YG8mATNoXsz4RHi +evtXO8DFJ87d7fNRv6RWN6aV1hf61MfGWGX0v+qLxzGJtwalC2w6YQVmisF/IuOY +g1TM3qtj58DPFu2CCaFcLVDpA41k6WvY+haYSoHxw6O8FUMZqCJgvo/rgaulzmCI +IvPVGqoaZNZcaIqkDkPnXCF7Ol5Gz67SUG4p3meUIJcC0JoYO6rhzrTdom/YI2to +cYFo6qUQX2xoyHUndGS0iEYEEBECAAYFAj8SooQACgkQ1DyzBZX+yjRANQCgoeSo +eX3vAk26SuqRyDVfGvhX1MQAoKpdtVmx54GyB15T8KPyN/n8lm85iEYEEBECAAYF +Aj8ROC4ACgkQ9Wsmo6Y5nnOc4gCgqb5ypf7CM7x9gGK4YLZbcvWAjqUAoJmHY1di +lrgaafw3qqscNwTey5GCiEYEExECAAYFAj8QZjgACgkQeDPs8bVESBX5KACfUp9q +RTLm0lLHgY9wPqJ32b1/aR0AniiRO65KcEHUZ5AJA7l6Q8stU3kfiEYEExECAAYF +Aj8RP+kACgkQ6iGZQSR3yvj3UQCfSgvBuOlVuCOx0U83Zm30mrxsEK0AnRmDl3XT +kQtv/wOCVoPXS21UaHFziEYEExECAAYFAj8RXPsACgkQGf7YPOK+o0HcRwCg9z9+ +ln1+teEYBfS9QCaX8DYR22wAoOHlbP+t6SnqfoFg8P0rqKnk0N+RiEYEExECAAYF +Aj8RpBYACgkQxcDFxyGNGNcdmwCgpPCow3W9Gb6xjeKu8bLoC4SWLKwAn3ClU08D +C3IBK6f4gAG5+Ad9NspgiEYEExECAAYFAj8RwdUACgkQvpyGjQRgTriRlgCeIoQh +eYO1QF9oYli4AkJKP4Rnxw0AoJ1TGUjnasCUnib0LDTsLkz4G4obiEYEExECAAYF +Aj8ShtwACgkQoJD705cZn8OiTwCffk6fmJbXPZEjLvz5mMPKqihKEDMAnRDLrmVU +7Zyr1MTNkEkXUdRKU/R4iEYEExECAAYFAj8SkwQACgkQVm02LO4Jd+gV1wCgp3rq +b/jQ6p5s7mtGz4nIGq5rWscAn1VG5Y74+kHz3zIc4R6+cc6GfgYgiEYEExECAAYF +Aj8Sl20ACgkQj7mZcU7rMfFoFgCfULiIrce0s4O8RkaA1/3Aim8vw8gAn3pJeNz4 +xbjG+SdSIkt20PClEdsZiJwEEwECAAYFAj8TMi8ACgkQtGuSO22KvnHtdQQAq36q +n4gFtu4ocQf1pDaxZRyuEvwjuiRmrOGWRbSwvz0xKWDflYxfHPz17XSbZsTrk3EL +OoVVlgaSDhwf67SLfVlyYW8lxJVXY4qF55UNQ2+fe2zlJ8TKQd3FdxoRzurkMoEX +4kay3hTFBH+nRqVS6a848yDEuTFtHSbWIh6asHGIRgQQEQIABgUCPxNhDwAKCRCt +7CzRGpU359pzAJ9ovdQwBw48LD0l5oj+NyBJHUkVIQCfX6/AGCDhhryIn7wZw2UI +CZ+I25aIRgQTEQIABgUCPxGlCgAKCRAoxvVrgXw1aAJQAKCQBwJZ+fZpd3wpidfj +TSsO3DNzGgCbBFivSKHERjKt+BMU3FD/PiQVvJWIRgQTEQIABgUCPxPyOgAKCRC5 +gsvVwOMfHay/AJ4x8E/I6NaP+MZCRghVnBbc/jWXdgCdE4NPmJMYlS4DjEi5yrnO +GTAoZ+iIRgQTEQIABgUCPxQadQAKCRCAdScAZahB7ZzWAJ9U2/wm19/e5hO6ctED +OU4tyNX0HgCgtvah2EaEJCeHBtkcxV0gNAkjTcCIRgQTEQIABgUCPxQqPwAKCRBs +dheMoO2YLdhsAJ9SnpDiEONSVKp4WbNUEdYg0nfQrwCgllFT54PAfK9imNf7oqm/ +u5Gmwr6IRgQSEQIABgUCPxQtmgAKCRA19mF8UTrv2SncAJ9ZGhHJo8mLfyE4N9hI +du1knh4aiQCbBaPnoJwUU9bdGpIWdG8iO0cBPgSIRgQSEQIABgUCPxURowAKCRDV +Tq5LyZhwscfrAKCOEb1D/zxJhDXZwpbfsxzOxGCM5gCgxwjjBCfa0eNRDEliX8LT +LapqULmIRgQSEQIABgUCPxUs6wAKCRCJzUshYHVZ5vz+AKDIHISOOuQrtpEOsZuA +IbCsGxuMVgCcCx4HWZUoDtnUQCwKQ1qdoNLGo26IRgQTEQIABgUCPxZujwAKCRCE +LNt6RHeeGHlBAKCcghKXmdVvFv24BmjjNLblVkI19ACfTmvdtA319OVUdb8vj8qk +8u6iRvGIRgQSEQIABgUCPxV1MQAKCRB8IsOfgHrFOu+lAJ45JtfYzbCAQg8zqq9b +KYuPnb9QNACggib0rObV9FWyAtyU+YPdzpYdfcOIRgQSEQIABgUCPxUSaQAKCRC/ +QVlbc3Kipde9AJ9k8+gTNbm0kCZQR/Sr7nUp54qT9wCgozihBCCCz1UlyKlpuoPB +Lyqn+Z6IRgQTEQIABgUCPxRl1AAKCRCUj9ag4Q9QLqUPAJ9osOfIVyhbJsJG/jaW +bPHLlhO+4QCdEndVlz3FfEIvIqr3un8aS2mnR8aIRgQTEQIABgUCPxRl4gAKCRC0 +deIHurWCKZ90AJsHI7U/TK8ASY6qQnCs319TrsoiCwCfbzBLW6IrbkQz2ooGCWKv +XGNZaqeIRgQTEQIABgUCPxVtRQAKCRC7VaR/yQHDPnjcAJ9es1zm1Kbba+MQpMJ/ +W7LoojAEQACg/qe/YgPY8kc3XIT3GTAxt4uU2NqIRgQTEQIABgUCPxZZigAKCRDn +yduv41bvwEH/AKDAx7U7T+mag4+nQgJt3fVtBaBotgCfUc8zZ1GoO+4nl6J16HaS +383ZMoOIRgQSEQIABgUCPxcIVwAKCRB3+BUzuw7ox4LhAJ985s36sd3XVShLnNSs +oWwBCASHuwCeMR+G2M9etc91AwWmWTAa7Cm5oyqIRgQTEQIABgUCPxZaGQAKCRD0 +tLDMeX6/q2ixAJ9s5BGe4RAXi6h8crxOe69xY8Z2UgCfa95gIjyGx/78TvCxTld1 +rN6qsQCIRgQQEQIABgUCPxe0rAAKCRBGzFxj8xilakodAJ44FYFEomCpZ8fZiY/9 +kuQaxxSvagCgulF5/z2p5KjhzG3WB/ujP+VIhSSIRgQTEQIABgUCPxfUcgAKCRBT +trgdwTzuB6pxAJ95M7TpYjim9ooeyC1t8escuno0LACeOe4iq+6JWhZcow3us448 +Duvc+IKJAQEEExECAMEFAj8Whg2GFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBl +bmd1aW4uZGUiaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9z +aWduaW5ncy9ub3Rlcy5FQTcxQjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2 +NjJDNzM0LmFzYyIzGmh0dHA6Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9w +Z3AvcG9saWN5L3YxLjEvAAoJEKseS2BGdWseknkAn1m1/xMVTIsJr18NZWVWaduY +SisWAJ9zpOZlUDvxUgygPf8qxpw/+QjhLYkB1wQTAQIAwQUCPxaF/4YUgAAAAAAa +AGNzaWduYXR1cmUtbm90ZXNAcGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4u +ZGUvfmJiL2NvbnRhY3QvcGdwL3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzRE +OEIzNDNFODIxRTk2MjQ4M0UxNTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5n +dWluLmRlL35iYi9jb250YWN0L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZRS +swf/d/l/jDhzqfSTDH0IpH1vTt9k4+qN0LSVv2z6keHd3LLS+QCVZAGuNuJ0zDUn +oGuYfGccqLOMgnmTR+wQj1pROA1cwmISpZUn7Mwbd2yQ7KMix12/Gp3dL+KfE+UX +DILLeZgod8ZyR35Sq17MsdFLMl9OCBCNCRigbaTW62be5HApsayOX8DjCUnkccnI +JDqjFr9rpPlPOixLzzBi3ymLmt/Us3gXPnDIvQ9AOjk/xrLkvqibLx1SnehXuclq +Xy1fGz70/VURD15FKR+EZoAC/z3KSt+yi5LF1rQ1JrvgWi3R+UaiQlWhjc2Y2+pC +s9MzNJ6ajY7JebQloTBXmTZrd4hFBBMRAgAGBQI/F/CrAAoJEJEfSuaGoRjm0bEA +oLmnPfLKN928w4MCbe1NEzN+JZ4pAJd7Qupi2vK3rYjHL6at7N0k+h3kiJwEEAEC +AAYFAj8WkE0ACgkQ722CQfCBGV24GAP/VUmlNMWdNqADJeAS9sgmuwY499HBfxKC +GPoUJQzz1Kp8UJUErXW0lnZap3Ovh+QWdZOGOwpcFjs/ph27SH+skieKjg+X8IsA +z7zN+P7UJ8NDWuVA7WWlgJuubDPpWCOxcDcxefB+qUL8L+riWbmylEjron6SvAN0 +44J9fSSeCLiIRgQQEQIABgUCPxMfJAAKCRDQGfXvkCeriFR+AJ4+NtZifShtVwlF +OmhpQeVKb8MZRgCfQfCYbEjyHmj0dkmBa1uBB5q+E9uIRgQSEQIABgUCPxh7XwAK +CRAzCwOLbGN0bd7PAKDiCGbuxIi44hNaZp2k2iopmZp+ZACeNb4Xx1QC/UfFYIUU +GyFaLy3AkjuIRgQSEQIABgUCPxh+JwAKCRCxqd2C3IFLCedaAJwI5NSu6QLC31Oa +RVhwK4fMj2mRHwCaAv58aG0NwzECcAB9Q2CMu3+FnO2IRgQTEQIABgUCPxfwYQAK +CRBWQSbyKfGb0fu9AJ0ZDxRkyQrTjBgZFNhmgLkkkc4T5wCeP2xiAp58UrX3zOlB +gT5AKMrqjWeIRgQTEQIABgUCPxhKFgAKCRAadH5FMOC52MvlAKDfHIejXjn85Ryc +Vfjx1QZfkr9l/QCgwWteC336NJVKdgNTL0e/uyVjzTCIRgQQEQIABgUCPxh0/QAK +CRD2KOuTR0MgbNw+AKDVZRvEepBdgQm+WtRWY2pZyMK+IQCdE3CgB8xrU5PEG4hA +qLSARu+9pAWIRgQSEQIABgUCPxkroQAKCRBl3zTAK1+F49K8AKCPN+Q80sOUAfGi +yeaS62P21Za71wCdEiU6eO1A/G8AoAfJBOnNOasFJMmIRgQTEQIABgUCPxmU9wAK +CRAh7E/chK1nbCH6AJ0Zs14KeXxHenncYDYQwaRytW/legCfalBDlkhqD/GU7Xic +XkIntVILRoiIRgQTEQIABgUCPxplPwAKCRDOinnXmAFtxxlSAJoC0dP/HCw4x2j2 +u4ljZSk5dQh6YACfTEtkWHXY4be31uF2iqf9fcOpGOSIRgQSEQIABgUCPxuRvAAK +CRDsDq9xNneAJV/IAJ4phQH4WQ317AHgTlQMU+fqHJVNMwCfcXX7srpJDaUj3GkU +ETUmfROkgFqIRgQSEQIABgUCPxwpdQAKCRB014DXvzux3bjTAJ9cDtHwxak4XAXy +SKhGvMOEcKIGWwCg0TkJU1hJ7lOD88MI3+GZmP94NfSIRgQQEQIABgUCPxXJzwAK +CRAqJXt3xjco0mMDAJ4/2AWeFl8bMr112JR9YutxOATUAACgiTSoWjRDj1MT82Zk +ljcQbsBYvYGIRgQTEQIABgUCPxAiUwAKCRAC1u0h4yxPSzEVAJ0TiCEpUwGnQNXY +vcxtdx+9DYKM0QCgnkP2SvxPfAB5RZHbXkWB3iN4FxKIRgQSEQIABgUCPxx7wQAK +CRAL21Oxos+KOADzAKDMIFe5u8tfUq5pyaxAK7NyrWx0ngCeOlp6LDGZSOPyV1oH +qLQDAJrs+8WIRgQSEQIABgUCPxzaFgAKCRDID3RZrcKezYVqAJsHTfZZV7NhFcrr +jglBZAixUHnNLACfcZMmTNrQoPpfPgoAiM/g3V+E3v6IRgQTEQIABgUCPxW5gAAK +CRBL7yYkIt9Ah3cRAKCMCv5Jx7psrcqAkn0Zx6yojSeAOQCeM1Ub3yM+XcRuo8i8 +HS2SUygNR+yIRgQTEQIABgUCPxW5iAAKCRCVZB9rJT5Y45LMAKDcLu+jtrA9WqnI +1UPw8I+suNflGACgvZ21OB2nPFvzsBDJQSY921C2k9+IRgQTEQIABgUCPx2AngAK +CRA7v893vYsFDTTDAJ40XIFc472Yv+8gHICgcJTG8ATHbACcDloWcwv8vSnABT6R +JV0U6bPBmu6IRgQTEQIABgUCPx2UZgAKCRAryEAWIGh4lYF5AJsHGbKmJXb1Qvx7 +1c6n2jNWmK81gACfYbmpioevt3Y3KSjlf12OEOxSFy2IRgQSEQIABgUCPx46sgAK +CRDMAZrE/xbW6PbNAKCebFEzvR8xnYAJT2ckk1I3C3qOsQCeNZbsexfRL4b+dDFC +cRBCTqSDpz6IRgQSEQIABgUCPx6ZMwAKCRA0UO1RP8wqkGZJAJ9+DCk9lV2Svnd+ +l+7u5aefZL4cBQCfdCD+yUvcJj9isbg4RCgKkqDh5jiIRgQTEQIABgUCPx7TtAAK +CRAo7rNaPo3MwJ4hAJ9dXJK1bIDR5/0GEOCLHnAV3G/bTQCfcwoCvpk2gKUbBADC +7JfNvsn19tOIRgQSEQIABgUCPx7ZUQAKCRCSvJR2Y5QmXiREAJ9kpiEYox6slmxY +NI2Mse4nBv7I5wCcC+sOnQ0lMumt6KJjpav5GzKpbIaIRgQQEQIABgUCPx8BvgAK +CRAo3bD9Gcm2ukpkAKDAiwTTAJsdKVc1VhOBERBSqQ/uCwCgqiVGLPYY3+VrNuH8 +xaNCY5OsuKWIRgQSEQIABgUCPx7v1QAKCRAakE+JnAT0Vn+CAKCOpLwh3WFEdR05 +bhTihE3sr4oLEQCeIalp5fJMik+TJdAUilxf/cJUF6iIRgQSEQIABgUCPyAnywAK +CRAD4Yxrg+URDwflAJ4m3noUwZQmNE5y9rr/3zXmtWUHigCbBYD/QUEGD+rbosE8 +yu3bxELdHJ+IRgQSEQIABgUCPyESpgAKCRCkU1GZ6fLHRySNAJ4yOHY0XnCL3MO/ +ccT45BkUls6ctACfZ1G/ojmCshoejKeEm+V2fjCy4leIRgQTEQIABgUCPyFzPgAK +CRCUmyXsB0RyUrZOAJwIHTQ9q9fMrKLrYwNcvbhPZXO3LwCfTg+ynV/d6VVli4Gy +x44xSEo854uIRgQSEQIABgUCPyLsxAAKCRD6jjeQkFE49AgzAKDBiS576xIrLq8F +rXoel/BKxEbxWQCffVbXx86q6BfQrg9je6j2KcKKkN+IRgQSEQIABgUCPybB5QAK +CRD0PnJmPMiMCfguAJ9zNZ2SHdPQt9mRs7fmJ7eFzXL+yACfSRTv3/LMwz0j/EIE +LcjTMlwf8l6IRgQSEQIABgUCPyOdjAAKCRAYoMyNVwaktIGXAJ9sx9LPQiA9J6z2 +FkB9qhbl17If2QCcCCtWo1tICBg1P/ExTA2BwnFAauuIRgQSEQIABgUCPyPEAQAK +CRCUT8anamoLvKHtAJ0TyFAX6asPnzbpFBjLtY6bzFqeBgCeMUofVcspoa/0/YBa +A8hSD9Qd/I6IRgQTEQIABgUCPxvrDwAKCRDYDvNai7Unr5ilAJ46rCD0b3Ywssdg +c/bBBUS9kgUzkACguVCo26BCv86vOgOBe2wQr9qEPZKIRgQQEQIABgUCPyfZIgAK +CRBvI4vCT9paDCFcAJ96KZRIVSLr+IrMrYoHd/H4r/R9uQCgioG+kSWctJYlqMxo +4fatptDbM4CIRgQSEQIABgUCPyfefgAKCRCfzyzNPz5kJqT2AJ9qA0P5h9X1TZ2t +ckVTEt1NRX9ydQCeOsbIvSvlfxdI72Bbpb6Uj8k1uwaIRgQTEQIABgUCPygYAgAK +CRAEMjbrEHMZdzbaAJ9TNJBBoYV7cPOsEtIm4546RqsOgwCePRaDLbRQ+zojgFYE +0l7c5G2kacOIjQQTEQIATQUCPyjtT0YaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo +b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ +EKR5zcRatGBq87MAn0fdtv+HO8PkzE0jwcJTFq2mBMVAAKC/cq4wlxqxRnnHq0QB +vHPbR1ZKv4kBYwQTAQIATQUCPyjtWUYaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo +b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ +EPl8+eM6S39dX/sH/3xKPJriQO+GAhgL206tg3CC0HD7szn4zstqcokgLuIDhnBU +dnEHq8RH5Cm9y31wfSJBhs3dhJD6cLEBKxZmO05T2eklYeGyhRzL2MH7PAj5oIHx +Xds7ue9k1OJbBlEugj0SQaO3twWv8DM68ynpSV89r7vYQXDIB+rDJBSUy38f2Sf6 +QEf31nThMgOo3zxg0HTnFqTZxF/Zxl+qXb29g/LIVo9Ro95AI62DDLbeBbo3ofX6 +pb9+iLLBO7gEp+jzLYWITpbS3yG3N+3kxJUSxHFkTVVnKUWdkkF2ba5VcdWOU8h0 +qCjds6Bd6AL9r1d9+OTAGNJo1/hKJmHB5i71HAmIjQQTEQIATQUCPyjtZEYaaHR0 +cDovL3d3dy50cmFzaC5uZXQvfnRob21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5 +c2lnbmluZy52ZXIxLjAudHh0AAoJEHkFdo91hPXYWbwAn0wIO2rpKpKPbfLlYPLR +qogcYL7MAJ43Jo7qeNvX7+R1Y2egJKUMtJv/GIhGBBMRAgAGBQI/KO1zAAoJEPnQ +FPA4yYWN1J0An2MMMdigRu72LLgPs9y+N/OcBo53AKDR4YObuiiSusq05/0/IpRP +SpyFUohGBBMRAgAGBQI/KO1+AAoJEF0Pf0ng5J80GzgAoOw2yq4lnPopbXJT7NbT +SzYUdQhpAKD5nJtD1PBQfMEWX7+E9Q2eeq5LMIicBBMBAgAGBQI/KO2JAAoJEBuw +i78qkjIl634EAI1vXWW3JV4mRLWURiatAXE6ELl1t6zkcacP+VfsSpABqKw+/6Ga +rnpnS4/9Eg4RC9F1uHcx3HrZiWoJMdrmJX89QHuCF7t4d7DJk9HOSlL3LkGCe9m+ +Z1rflATrtr1MykMly8P2w8GeEsegeP/qpXA5M0IT5R5Ydq8/bcDayvBXiEYEExEC +AAYFAj8tVsEACgkQLJg+WtKKVdaquQCg1IXH52P/zc3SAg2BS9fwUrFfT6sAoLLv +pZMGtQr4Ls1ENx1vLn2/5tYSiEYEEhECAAYFAj8ueAkACgkQEgljnRFKqFzSIACg +4Czty3NmmCDd7ZytqaDYpnluyZQAoNXXygq5k5mFRSrYBNbKLQ2pTmcpiEYEExEC +AAYFAj8tjjgACgkQTvSphPLKucgE6gCgh9l3Htk/cN9inNeozu2BxwCVnTcAn34l +GxnITs3t11dr5fgeWntxWojQiEYEExECAAYFAj8zVvQACgkQyg4WnCj6OIrOcwCf +WFi3qRdARzOjOzHc7e3wkE2Y1HIAn0sI6DnpFArA2q0B4+QATJtwNWNYiEYEEhEC +AAYFAj8fL+EACgkQ2tp5zXiKP0wi6gCfZqoOI9vrerzDqwaHpusmhWZNHf4AoLxr +H4N+VDTFpyf2fcF6kOjTdOI8iEYEExECAAYFAj85JnEACgkQRcAhR2mr3VTtWgCf +RkvdJ+JLLABz0Rf8jUElesJAKg4An0T9vtCGack3TYp20xrkVjB1Y5E5iI4EExEC +AE4FAj8fB3FHGmh0dHA6Ly93d3cubWF0aGVtYXRpay51bmktYmllbGVmZWxkLmRl +L35tbXV0ei9zaWduLXBvbGljeS0yMDAzLTA3Lmh0bWwACgkQ3oWD+L2/6Dit8ACf +eJyQ4Ug7UTwpgMM0bh6ivqV8O00AnR56LyPYir8xNMEDvhxW6CIXNZTtiEYEEBEC +AAYFAj81i3wACgkQadKmHeJj/NTf2gCeNIpt7nvOdpIk9TJvYTJSn6iLUaEAnR8o +uhq4erZO00NEtc4llNzaPfLSiEYEExECAAYFAj9ka/MACgkQZmZxetuDVnmoNwCg +0J/dSioWrpCswFEn0FjT/nDiSWsAni0xT8LTtc3rlMblmleweYHChwEQiEYEExEC +AAYFAj9kbAkACgkQDZZLZlcObeqx0wCfYoj+KssyUhVS56GB2WXKuc4sorAAn3Ol +tD2OAjvwcuLi87npRTTXQbtjiEYEExECAAYFAj9kbUAACgkQTgKsrh3Ws4Bt6ACf +cBrI0RT+qtOaq8ZASC0I3OAlM3gAnjR5oUgzTC+9U9M9jdpZvT0BeSSxiEYEExEC +AAYFAkB3KgAACgkQpD5tJxKCh+jl0ACeNPz/WFH/10uxp2l6/90dV+2ElwsAnR0k +7I7LxUR+O9SuzpPueEOYqH8ViEYEEhECAAYFAj/cWFEACgkQxRSvjkukAcNBMACf +Xfg1gsZGuwz9Dh61eZ43DrNYiQ0AoNtpKAN53n6fa7qEzw0o2cC8Y2soiEYEEBEC +AAYFAj/pG48ACgkQZKfAp/LPAaiEogCdGd1scuANXPxbF4w6df1zGChirXkAnA1w +uWcW0c0cO2HW3ABlahR6wPPBiEYEEBECAAYFAj/MNCYACgkQoL6dujuIbn3dhwCe +JqloDYulF0Gs33SEON55laT7fVUAn2QVkMisnawg0MbX6THp1pLAdBTriEYEExEC +AAYFAkB3tZAACgkQhnv5qfvT645O3gCeNCTIuIs9+6w3jqB7GQaLXXpUueMAoJSP +KUrk9dlxe74XK0fedbmaKSB4iEYEExECAAYFAkB4vOkACgkQzN/kmwoKyScqLwCf +c11cQ2SYeDBEFhxb3Qc5wFL/AXUAoI03ZmLsly+9p67WmuY114lh7jpmiJwEEwEC +AAYFAkB4wnAACgkQq/8HtEbzIS2zVAQAqi9LRR7bEeL/KZTYonpAs076eUkjxksX +2Ls/ecQ/3ERA9fze4Em0XHGOLAVzKw4MIv1oWRiyfzXb+6J2lGw8e9zQM33Y/Y9Y +Dq+YC0umSiPHtL+225dQdS4HXmfex6sDigG5sZ/cou8HYBwR5oIHD6QM0QUbfj+Q +plk19ZhEHxGIRgQTEQIABgUCQHnwrwAKCRB8O3lwiMfB932kAJ0f16e5tFae3JN3 +61C13Tx0ck3waACghmo7zp4EAuxr3FJW3cDeMeHR+1OJAhwEEwECAAYFAkCX0dQA +CgkQtWeUZ0c/fvoaHg/6A1i9isPv/kxiOEI9unftpwweApV3k61hxwrd6auy8Gt6 +2oa4/KgU2S6uZkUamO2hQpfNyXX9iTF0XhnHysKBDnyv3dmfNKAfHB/RCLqYWjWL +zABHvN65BLav4Dfa8yizbiwbx+pnKQomr13i1hcL3h35ATw49TagyJPQzCUNtfZu +C7Rj7QeMmmVM8VTqMRRAET5lqdUVuB1YHnc1kuER9JWYmatn0AnX2Szkj39gi08h +K6cq9mIsjCi15jhuY5onYeQmVsnfOBCZmJ2XyFzex8Kjlf6rZDrt67gRZAc9noov +eL4Ifw/Z2OXaWZqrNa+yvWR+y+0AXlxGzlZTKrSr7MFbsQ8vG06G3K68n2pX7iku +AVvF1RDkFZuFRrde6ggl99DlbngM2cgRJne4AzTKJrgzfOOUD6SLDFdaFTwDHP1q +kGPV9d2jN3ZOUG5ZusNbM+74e+3Oo7XLW1j011auC6SDrv6ndZQ9Z9vZdYw4tI47 +LWBxYmZ9CpC2GqCpstZiovYjB4RxrYiQNLVV9KkSLyoreHrBb5JLvgounK3W/3JV +qDdqg3ZZobP0JQh5UhavlxzwCK6idp+iBcUHC3CtEeytz2bExh49wLfmLWpEFAZz +l50A5fvvgj5AjeQiwGoTrD6I9l2KRu3fvmgXjZJAahZz3NyyDb/g9TS8fvY5c22I +RgQTEQIABgUCQJy1rwAKCRBDGjztotfSkrrFAKCtMRim/eEp1ZZQdLqghyfBv4KO +sgCggyFU/TEAQM4eiK7lZTZcDxkHt1eIRgQTEQIABgUCQN7OIgAKCRCzdT5NUUs+ +fElcAJ9H1NGrQc/RCdJO3XXpwazOqDlWsgCfVJAy3/dzjdTEXIuzunwcMOatemqI +RgQTEQIABgUCQOaoFQAKCRBxXtagfnuKyUNQAJ43EoKiOLUgJQmOhPX/Mfnx4C25 +cgCeKsuX7YXeCNS0xzT+00bbISBmEgyIRgQTEQIABgUCQQQIbQAKCRDbTMxLKjDX +KVk2AJ9DFIsf3VdcXXuD715uRFqDWOH/vQCfa7q9DAG/s0zdXQ+rPNQE63pqmb+I +RgQQEQIABgUCQU1UxwAKCRBLIOcA56zBhyyCAKDEcrORvNKFS6a8+jDCGXbWmd8m +VgCdF6IW+ohQTfxmbsWNqp8066ix2Z+IRgQQEQIABgUCQnIiswAKCRDT+ZXVd2r+ +Em3+AJ9iOcXpqIA9u99C7v30zr/WxgsEkwCfTLANSobqy/GLvVyItLjiGrEFp4KI +RgQQEQIABgUCQ7l+AAAKCRByHrGwzuRJeEZRAKDphuCQVBHnJ0jNRt5gE6ry7Bjz ++wCg3X1hA3hzleqMay8Kazhx5H1+712IRgQQEQIABgUCRBqs7AAKCRBBUuHxxnGG +/61lAKDr6KW9NaW7hf9+uQ0+sz58icccrwCgkvm+iYD3ROLubSn7ZmtTa2Xh1caI +RgQQEQIABgUCRBqtCQAKCRCqDNHu0ItH/tFCAJwL56EGCMAq/ojS4PlLwyWFlCnz +rACgjKI++vABdNS01zi30QJMSf6OS1uIRgQSEQIABgUCQfwrkwAKCRCY8qTu/+W0 +tm4fAJ9+N/ujThD65SquB2oBmyXsQTcBcwCdHvcqGVYM7/u0cZwY3K+jIAA0F6mI +RgQSEQIABgUCQnIN3wAKCRDz6FQA1wqv+UqaAKCjoNCBKl+bwWkdTGHuyXmlOZEI +jQCfVTKpX8xgxXHqv6k6/ulMOUD31YqIRgQTEQIABgUCPxvrDwAKCRDYDvNai7Un +r5ilAJ46rCD0b3Ywssdgc/bBBUS9kgUzkACguVCo26D///////////////////+I +RgQTEQIABgUCPxvrDwAKCRDYDvNai7Unr5ilAJ46rCD0b3Ywssdgc/bBBUS9kgUz +kACg//////////////////////////+IRgQTEQIABgUCQHezHgAKCRBsv4suVls4 ++UPzAJ43hajJMePyTwGZmhE077EeXOtXSwCbB27L/y+tt1DooFNT64/skgJXC/6I +RgQTEQIABgUCQdHolwAKCRDg0NExEXGwT+X+AJ4/oqNYw44Nxn/N1U10XRpumuJi +KQCfRJrb6+M7rLOidrXahHwMPkeBURaIRgQTEQIABgUCQjgRawAKCRCvc7YIqUBQ +r8bpAJ9UKImdTczoRmWQZJPu7niWnc/HDgCgihWFL/uI9cKn0vGVUcFHbeTNEx2I +RgQTEQIABgUCQj2ItQAKCRD4LlzASysrntXeAJ9JwtUtRj2W8n0JH/wtY0Rpb0/u +QgCfTcAzoL0d/zdonZ/FhkO37xLul4KIRgQTEQIABgUCQnI52gAKCRClBubU3U1Q +iJpUAJ4nQBuETnRFytABRiSMDvuK5hYrHQCfQXL1NfJx6AnyhfUbw0lxxmHgrpyI +RgQTEQIABgUCQnLGtwAKCRDdynmcYUNN1kMSAJ4oQy4OMkrgajvGeJDjQvLdJj53 +sACgiYCiSwosFpVz9oSCuQeZ7qsfSDaIRgQTEQIABgUCQnL5HgAKCRB3/iD+qmq1 +y7vJAKCjoEjo7K1aCa4RmWCxf1/0/Us+8ACffk8KjrIdrDJzVdM5NHXYcD4SOO+I +RgQTEQIABgUCQnMYogAKCRCf8lg+aBtkaRDtAJ0Wbit7y4DewNZiBCGAsGo66oif +qQCfSXKgIleO9Fddnreh8vC+Giw8B+yIRgQTEQIABgUCQnWmLAAKCRC7xv+5oCEv +5Ge2AJoD5QCB1+IlZXc3W4rkAo9YjxWtZwCgoI5I5XPDMuGsJuHSnEnOJnVHSzuI +RgQTEQIABgUCQnXM1QAKCRC+PO1Hxs6gya7dAKC7l9PQFrr9MyxLqIwSZzKAJk5Y +YACePNGy/wNgKhMtAzKuHL7jZhLZviqIRgQTEQIABgUCQnZInAAKCRBGxZjby+xf +gEg1AKCM3tdxh2s8lbraHdWScpUBu+6KIQCfaY/hU72wV17KVG9KXwETr4iH3E+I +RgQTEQIABgUCQnZLrAAKCRD+qzY2RbLXWyVqAJ96fiAU/WzVe5IDnokDrQBNYLlO +6gCeN4wtjZA0LYNfdJv+bfqvdltTEe+IRgQTEQIABgUCQncqMgAKCRAN5ydtXgV3 +8l/EAJ9GWZl7Gvl4kYK9i7asA6mIz9QlNQCgyVPu0fzbUigRBskerqJxYz0qOLyI +RgQTEQIABgUCQndHTwAKCRAO3cXyakXIFuBMAKCMtXYLJmQDdCSzq7qFfYTg9NZv +FgCbBQfXf2EpHAEQwopSz7tHCuHnBXWIRgQTEQIABgUCQnfNGgAKCRBKw5P7otBp +NrpLAKCJckctqEq/jDqEfcdHajtLJCznkwCg2sKvB/LlZtkOuoIneZfWx1/nnsqI +RgQTEQIABgUCQnjY0AAKCRBwmj9gO34W4VmZAJ9SymG9oRHzwTowbe4MAJWTKbj/ +ZgCgrzoZwzz5v/PY6bJr/oe1dTxjB72IRgQTEQIABgUCQnnJVwAKCRC81a2QeT9r +AqyeAJ49eMAaPQQw8ht3oKZGQlza4L+w2wCfcMvbc7JzONfXHCNywWgXx46YUp6I +RgQTEQIABgUCQnpNxAAKCRAf15DD8aLe1bmWAKCsZCQraaj3Ia2nzHgSasIlWP/j +zwCgorjV199hJOvdXBHhwRGyeCXBV5GIRgQTEQIABgUCQnpe/wAKCRB6b+tv/1LB +UK7sAJsHbW4PC8zevjnWXn40ihmDKVC/EQCg6X2LQ+1XGtzaRhhDUfy0GVAupd+I +RgQTEQIABgUCQnrUIgAKCRAGUeUmdLfHKrXfAKCeheZcLx9lUd5BUwa4bPYUAxKq +9QCbBJvviKSYdJxXZNlmld5S8YC428GIRgQTEQIABgUCQn7OEgAKCRA8Y8o/oLPo +ixoUAKDJeK/rhuKpG26/lRihhVo+64jR2wCglAqCyhcczML4A822cTShr16b3piI +RgQTEQIABgUCQn8UKgAKCRC4lA5tqXtpoA4rAKCwrHn5dsY/nuRdxDsQPtslJEDE +bgCbB7qvCrfdAXXYTpHH0Cd/Yi9ysp+IRgQTEQIABgUCQoJaUQAKCRAT3U4YLkTT +yvhDAJ9fb8ubNZE7PaVVzoO7o9YzRSlOawCgr57n+WuJ4mNJgKt5ZgC+95uzEJSI +RgQTEQIABgUCQo8wzgAKCRD23TMCEPpM0cqBAJsHXmTB4bzFtQL9YD9+xNRCR1ay +EgCeO+/L9mNHBDbQOAwZAR/mi0G8L66ISQQTEQIACQUCQnLueAIHAAAKCRC4lA5t +qXtpoO5/AJ463NgE78T3zHUXvOx6d5Ru+cyXkACeO3VkUyPyQbJIyM9sWEAgg8df +YySJASEEEAECAAwFAkK3NbwFAwASdQAACgkQlxC4m8pXrXxOyAf4jmnjn7d62EwR +rSdmF1j/mhMppsV4ESOdIv44tJm0Kw4WOkYZ/M+uE0Ti5U3sQrCoFe7aMSuZnJQp +XwEd4RlIPjGx26FyI2Pcn8rZsSB7wjarUjvS32pDMtrL3W8V68wvWeiBOnt77OUQ +3MLV1W6rVTKNCsGhrJwTt/EyjmeqqPxILvGTbDLtlwRrK1NtQZZHR1AVnJ75H1Ia +uyQUFzpI9TiY6lCALDhIPb6K4UlhI3Bqw8l4Ig76tgNa1JZoUTpyaDKM0qMKkPPf +Ne0/k8SsxlpDck2tyGJAFQIAzC6ekcUHK2QSlu73wIB8m35dvtahGYPmW39EdYAR +4rmFdCu6iQEiBBABAgAMBQJBzHa6BQMAEnUAAAoJEJcQuJvKV618YR0H/3alOq4a +MkPVB4ZN8iKNAx0Gg+cA4ykx3su4fuVfI1vuweZIPRLcGdGKubSjfiPOOpeljuwu +2/IQv70GHfucaRzHSRuDO2T+dShN+N6/IuckyeH8eAOuF2H2F0/otqRCgwOfM0mb +Rz5iR7/A6l59zBeL9TeZ8Bd+ZlaihRNrgsjdP1N/PJbkzithXxBPCpE87JHsNVdF +6yTRQgCG5T6J0v/wAJ4JkS4QGMJBBP2gK3n8sPS+Wo5sH6I8AflJQu6ML2By8pBV +03S961UU7xXv2ySI5/RhuOceLcxoLoS6xy4yrPtxVs4knQ/b18aSTa4UiiU4saon +m+nCasQDlFnY25qJASIEEAECAAwFAkHdmv4FAwASdQAACgkQlxC4m8pXrXxo+wgA +sU34Mms+OFXufehaXjXfphBvlI7n9n4gqX5/ihH9WcP2IKObNXAd3H1HcOelTeuW +uYDHdJ3yUF+cUN9+wDEzZsI5pYNqFmb3b2BcZMd1a7JItqC8Su3M73AXp5vCNjA0 +CCR5RwukWyIYeZ0GcIqs34NYCOBkT2+OLO0M5FegSUQ0B2UcPnPOSj983+I6ZYDy +9MCbJRXBhsGCFMPno3kfA5Ttaa2O/3iZwU7zanBjebeGcIbSCWDtKAXLx+cJfyyJ +JjAQ6irwOwr1Uyrum3JGJ9vA6flmHHf8YRmeT9A3j7UkDMjWC04+SeYCYlk3jJGP +tXJBUjKiijFc4PGiS/jikokBIgQQAQIADAUCQe6/8wUDABJ1AAAKCRCXELibylet +fLDDB/99+7DGQsYCwNMAgmmgsajK7Z+vz0s9cyZiLM3pQGdETqsGI6P4wC/eBGvv +r9QDzdPsEd+nffGD9gnqoTDN1NvykMip+pT1f4p1W69tRt2N/ibrAhaWgZLxVKh8 +XcKfHSjhWbuYg7S1qs2pUIHYsrDnCY9iwksFLHVv2DgiPvg7uoGx0acFsEwud5bg +BweMrN4BAOqOpTCXAL0zj24iutCILWywKs5o85NoMTEPiyqoM+n0a4bphpdfGBKO +7je8kJgy2XYrVyVzzewytNNE9mlBQRHBa5FNWEy4dQKoOtlXST/9YvOxZaAt9yIW +Si2YETUgz/xvYgOBPq2E39iywIRJiQEiBBABAgAMBQJCAI0CBQMAEnUAAAoJEJcQ +uJvKV618MmgH/03yS301RRPye1+aYDdSgccfZ+EdoAP+uZdXJuHVmBL5cdhBIcpF +Ryg4ACXiyLx7Q4ztsBEOB780CXswEhT0uTEyKSH2DaTQIyn8Ns/dd6ypcAU1+5Lk +gxUSMclzX+cSUQwuITuhZ14gQ8Dr7TLLcx7OpyLsKd4wBN8wW2KA7Fgp0FY5h9Ho +wvf+DUZRtLckMvXYkMNjO5U+Znb1My5/7y/KH+OTIJOf03J4O5m6+XyR42jUizp8 +UdRceXsSvZM3mskyGyv8xfMV4VsAQ6/CPPeoZWu7UY1OFIywTpfMX7s/hEE2XeJW +s/dOVJYrZ7HZDe8SKfqJuDs84wNsdVKzSBaJASIEEAECAAwFAkISWS8FAwASdQAA +CgkQlxC4m8pXrXzNGAgAhr8EN9rSNeldhN6+qCyzP2L/f9jd7GLMcuDzGNtzpkzo +q/WgVWs/SBe2uZ+uLNXdfcDG+I64fMdaji9UDqdGIybH/l0Ea2AfaLdR2/LYK2th +kfNWmySvN9sgwWaq8RPEKchRg0AsK1OKXjLByDPlB+vA81ObcjjhefKii3XVDSYp +2HoRXfSZ/Wc0/5JQKXPV5zdZBqZ6DAlWn1G+sSdXCZYR/X8s+m8VmT1qx9efWcnR +4jNfwQsgIbUWY1Fo7/tXGJ4nKywAk4LWZmM1dUkQyI3AZHNyPSXsbJoksAoQRFVT +ESn7PkUPsjOBMp0m3Uh0OUsUF5MgahqEtHQldXVEA4kBIgQQAQIADAUCQhapzAUD +ABJ1AAAKCRCXELibyletfEk6B/96IIV790+6BKmKPY0k8KJ+d8kUN2zo8sA5nIUe +0X/lEsIhVCIgjwEcPp/2Q3Rx+EV8abqHHjG2VgF4x7wJtKIabQZW/OQIS1snZe5j +66OTJbPPtLvFImdGQuy5uHHog/3ZaNO5EmqchaTsZPPhX1xbhXJlQuP4EXJ9+s1u +14LPaoZBHU/cgqYs+lOMeOHAjx282lX6X170x50PIubSz0B2VvO3rN1u+CNuLMTi +Qz+tv5vePNEtCmR3Hj50UnxkUe6r46fzA2Wb0YGNHbfbUY9nbQ10B7WUw6OaB9fT +j4nO+rS0ocw8txEziJXAeBOeIrSOB+/IcLsSKCjpj2J9JGoEiQEiBBABAgAMBQJC +KYicBQMAEnUAAAoJEJcQuJvKV618ioAH/i0A1iVSAMZSakBcBR+bP8iT3uLMoEkY +zWSlb+R7q33LQwWXgjix9Y/GyqFwCsYHDkFXBm/fYsErhRVDN6PLMWs7VAli8E9B +uOa68VDI+x4rVBUYvZ/KGP/7OavdKY3D/ZERSaP9m3wdEs9cdeSPAqnBhMtC8UkS +huUWUYwbRN5Ib96Gzwl3R0Z3WUKloGK5vbMchleXUXUUclAeFe5lJCwX2n24KCQJ +UWE2n9ervQHL9UOJoRedTUtOWPvJTTp+moy70NJJGgXstzcFHhuDxH4Y/gqj5hzp +UXJANq4rmkohkiNdBgV+l8RBFqNJ6yitRnwrYrIj0h4his/RY6cGwleJASIEEAEC +AAwFAkI9SRUFAwASdQAACgkQlxC4m8pXrXy7vwgAylGsb+kwxfkl/fxTDL9Hlcwl +Ek1NnXNmfbHryHh6iSg7PUvmrCFQ2ee+IUZcf1JR8BALI9gb093fFhWB7AxD+JTi +Lh/9AMuYbHe5fhDj7v1V+Nnu7WTP6z4Zqzt0UHDqdpmpy+uq1Q8Cg9k+21UxQ9s7 +mW7QBl8d5SOtb2XGiwl/HSUTv2tR572DYyGc9i+K9C/hIRtpnpJSaZjV5ZT6I3Z5 +XA72cfCCVU/FeeX7p/v6FqSEbr9/YUxbLt4eYZl6GRNDean1G9NIcZf0Ihi1fvuf +E8/zKNKUaf+u00TmEMi39troiRrEoziasITG9e7L3m9NgQJsxR0awR+N1DYcRIkB +IgQQAQIADAUCQk/AGQUDABJ1AAAKCRCXELibyletfMJBB/942fArMQnRknXJZw46 +Zhz/JTErKo1O1zCC1fzKgR8y+n7X8iEQsgWCoeFljpoxczzYixL98TSHXCtrXNAE +QIkIo78aufJpEgjEzX1Tgirn3RLteIg3kdzUwX5M9ZganWS+1VgzmycQs9UYN+tY +iTz3mN5bpJlK9Au8KjsNGRTMzR1pLUjc5eZwGWRN1HAJECqtsD0w0HYlHvGY6yfk +T9MVpH71BnK9pOorpJ+hTGD0Gw2O1k+pK8UBE1y9MvGK3K+WoTFihUbuT+aqf0KU +5QwPKrwvQe4yUrk4cpYjWIPBjhDkIll5yr19a199C3gsFoXcH8mbmh5AbKkj210d +PgXTiQEiBBABAgAMBQJCYiZaBQMAEnUAAAoJEJcQuJvKV618WboIAKLLpzY5c9yV +g/oOdwlb9tuQtdUt04R0t1wYeMYxed6Brx4/26fpXHtxUh1JfsJtzBpVMHBxnas0 +qWfZHywPyeDsXpWeSOYjGfAyGaN392e0ZtkPxWIx1KPaqnO3IVkg/D145De1A/m8 +Pd6OO/97ngFHg7C32EuS3YEfWaEcCo23qy/AvoRVbVmqXUJVC4aRDqg9rIl7juMF +C7oysjjMv7Qi+yLS7BNSRmO5x637Z4AZeJ0p48npd4HKbJKMXqmUBSLFhzUCMA0o +BeWxYld+sIHNW58tgkJuFfXQhXyY6dh4foh7roPqhIvI5lyxq0ZJoW76UrC0A5jI +t/qGskU5ym6JASIEEAECAAwFAkJizvsFAwASdQAACgkQlxC4m8pXrXxG0AgAk6hi +/JhLlElgbL3lL5KNOyAFssCcVwwrNufMHstpPJTFft1I4EGJpUdZLr8wUIvgxI8I +bZDEWn/J+B7uqFw+4iAdi82rTVZDqv62usotnXs0y5GPsPbWyICyDrmwSYeBnL7y +pDmXYu/Bf+H0Nx2ZCsw0zSIpHhPRc9Lv7q/ZJsGsxtF9FDHRheRf1wuZHhp5Vvo7 +KjSbl/KdezEOldULsZrQmTf1rTanrZnaYu+MSiL6A14+e9HG1OgykjvS/oQoefpy +gdkbvkBKirxMr8hPE2kUPc57FpQUcon5m3TcMh72NE5g9INPXlDv2j0yIKVaco89 +suxIAF86AV0D+xMYxYkBIgQQAQIADAUCQnU/cwUDABJ1AAAKCRCXELibyletfK+H +B/41TRknBVogdw63K9HNZkemH94eRXb1Y8bvw7F42oH0PTpcJOECphlBTzV22RnB +zH7zUt7oGM8FmuTCKbTds31B8Io1wSnp+7hm+2oLs5l7YhhrkjpBaVOisPu3zvwf +PS8Oo2qNBHp2TRfdWeP/dKlN6Pg64tzl49PJemJnhCi/Nse+zHr7Hm10jZAvQ7Sr ++JgJ/p/mhX1+L4xYqq2gqHzu0g5V/gOpFFyy8zsir5TyZViqSrsFtx+9usPAc2Kh +KqUXp2n58jXCW6wDKLy9L9plxshG2sp4RJ2cpi/+vz+LyZnoAAEuU/H5OxXC3izI +hn0fIyv6cVbmkoQkCqNl0VWliQEiBBABAgAMBQJChxEXBQMAEnUAAAoJEJcQuJvK +V618x+sH/3cplqFvGUxbm1oFFZNmp1aXy5im5m5cytJL9IYaiJtKuBPyAzUMzFLg +jcF6LDDhCZ/bPitecpjIQm2iNBj4ELqNot/UJdgRbfikN70dvuDWXeegTdhEPAXR +pSYoR5YDfeJeJT4ldxB2tO69tT+KrQZUaAZUceJjwsoZjXJa9aBWp1ecK3RRKVrl +CKqtApqZqgYk/RW09vogrvIQEQqjzclkIp0SQ/LxwTILgoy/bIMJZH2jXGgmQyXm +a/VT8GaNp9ioQ19nkORlHJqTrV5R+AeTmptGfJjGYZPhMO0wPU8I3aOtL5js7+PX +sqKc3+bqVXVzVObIG+x3aamHo+DkW9iJASIEEAECAAwFAkKJtlIFAwASdQAACgkQ +lxC4m8pXrXzNBgf/fJAoz8n7mRXeiBlSF0XFqpqrIKe0Hsl2nrSlRbUeEKMPLXOU +oFCuE73L5SBvT0u6xrxFpEVegPfeJ3AKlcTZYulA5LJSMsKTwcDSwDV6FjE5wEmg +1WwJ1E6Hw9p9MdUB0TIdrQx46yirymB+J2gLGnEMnjaw+3oVRCK/N61t6+3owX/3 +c6pN5FZfM5NgE+oN6EKTXE/teHm9B0OUSmq/xb+Rwt+xvMGLOuoh9bhA+nP5GvQp +xKPBeYbz+17dSV7IMBbWuIHCrKsgUP8ERScHcCYY0xjFLn2sfWExIiIHog5OGiob +9Wq0dwgQ23/2uX/zTgb3eqjWFmbqDKez9M+cYokBIgQQAQIADAUCQpuB+gUDABJ1 +AAAKCRCXELibyletfLzGB/9U2WMBn/SJpQA32jrNYOVsczX8dvgzJUA3dBJpOjBB +nP80ikAyEkzVcHa1xfoq2hptEdzwmaSYfYRFHb4oT6V3SvjwNYtyDBkaTqxdKW+P +Vy04fj0aGJL/cxLyMlYUybNo+cGxHfVwJWJA4VF/N/IPyx1VLeqTQnA7Brl89/ji +9VkRXtfLMF+WfY07XuAxQEvP3pShDlHzGMhPmkUQmdHlnBRgtLIZZDMZhK6cxVln +qudqR99MyDg7yq26ESjybrtSxCypF9xpa6iVnis3cMKi3S5Vp98oaH2Haof0qNJi +p0bd5GKe39xyzlzyS2xp1YpqELqy0Up9cADkc5nKsTqhiQEiBBABAgAMBQJCnNMK +BQMAEnUAAAoJEJcQuJvKV618RREH/jMt5I8jSpnlaHxe+B8eJA1Kl/kG77Op4s8x +6BljyqiXXDHNULILfBmC22mvEpTvOyxiWh8E6olsFTo9epgjh8coYYtxyBXKRY6B +y6F0Z16BG2vmByhkySc22GVJNEeZ8p849zonBSG50uHnttjAMlAS2duapzhhhI61 +RQ+4eF/TtPKghZGu7eGXqWR8ztVNaUNkvhu3nZneyU+OEZKn7LM0FY2oO5ZqnUGV +O9/HtRmLUluqrmsTfeMJxMa97n/+zIFKqx7VDIwA8SV0qMbnFw929wtKTG+Av4jU +9Mi+WjudyC/DYQM6Z2aGj6Jzq9O8yG/vzZRW5UQ7UB0o0RWKOVmJASIEEAECAAwF +AkKv7KcFAwASdQAACgkQlxC4m8pXrXySQQf/Vf48FIUYYVflloKQj/rAMyEt71o/ +qEEt9YfkhPg+vpoe+EWKgGatxpc82mHf02u/Q66kpv2jFvrN/boVG7g2p89f8K0V ++UYT5b5RREu8z+DaNPSwb3VCCZ6eXIjPyfRvP6GVBtbWOIZHSgHAWYuKGp0mVv42 +SVLYRx94+gp6AnnljQTjkYA/u7hDYUU/gqvUQlQL3QPgjL3iDGlkxC5Nwv/NMnAI +8Z7wp/Ol8++77yUC+OhsDhP+9hxXP/BzVhSWzXFlLBPIYmJ82Rnc81YGo5l/4QuB +noIjuDMCb/fydMMRpc+L/bgS0Cakqm0G0Ovi7h29kbJqlDv6s31t7fSjz4kBIgQQ +AQIADAUCQrSPawUDABJ1AAAKCRCXELibyletfE6iCACsegwbn+aU+gmv3qYxHafd +5coPwq20CnY7Db6iDeCytcN+IoqLX7v6fSUQgW1lsQDZaT4c638Z8I77OIGdSGA9 +ChuDk1U9pe36caHAHhDXkrzHv7w3tDrRnpEj0GJyo+OmPz018OFkzdpI9Tk775Xk +jYlxJooKEnTbggo/B4fKclSoUU4ADBvTt0P45E7tWlr9uqvN87yW/YGy+O6aDxM8 +Eq/8vrgZr7mYyE1M3ZINvaFg5dhPWmOqxOUqSt/SORg/S/w++uOTPeu9qf+yGg+B +jYNUJ9hIu7a35ruE5e3asQMPEMup8Iurckixorh1FKwRtcwAqjegDDxn5dPTMuQc +iQEiBBABAgAMBQJCyQdJBQMAEnUAAAoJEJcQuJvKV618OOYH/j96LP1Mvdc2hqkE +fnsuACOjJ+onzupaacez0jgXjmoRKqKLuBLCPmWModmzz0zR4uYWQJNBEGvZRBQL +yIip3gTa6xs/Ak3bI4keX8q9W9uiy9pzu7D3hM1asGFOruwNtgwxst7ppj9NUkN7 +SyRgR4qHFUm0YvY3ZvfHA78u2zLK00D64rmG8VNddrymP1TASYq0TFNZhXSUyfIQ +xFk4M4axGB9KfnYNIFUJjai1ZHw1xYVm2V3gsRcHBr8UC/MsuZNCfmzH8uZN/pWX +icFYqNwj/Nmp5Iio111gBNbqui0FzkeMseM9K7j5iHd4SbNykTAb1TQ3goPkdQuM +m6TPTXeJASIEEAECAAwFAkLQ+IQFAwASdQAACgkQlxC4m8pXrXzBfQgAglVzFEla +U5BD91ZfcU8pq/pj96VnHoruSKS17Y1reHt/Fot5qG2ocYU7FQv7ybF649sWLc13 +mFqNn9n01fy5FgaDguu/XeR+IDyXQbduplBZC0bpU4RLcPxr+esjNyckQR0TlRr9 +xQv6AbJ0BPr7sFgle5ntZTi43KnHOaW3SmaZPx2VST29KoHPzJj+5PrT50WavQHv +55kUGGJVF0/J47pSMH8HJmTld9O/luFMhg+ih1Sya7i/jNYIgFe4XxPAzNKPweyw +VobvpX5n/ohZTjctmELz7+CBQn2DKrpCr43TXqkR9Gnr9nrUOAOIctg6dpaN6VG+ +N4+l0winEbGQo4kBIgQQAQIADAUCQtGddgUDABJ1AAAKCRCXELibyletfNnhCACa +FcXOPg3JBbBGeUd7fIc0hHSNZO7yi2h2uvEPoIGfRZb82NyoXErWpce/N+h0a+Yv +8xiE35k3l1ZtfuFlwcdjCa9hk+yZ8hUqxo+e8AUGa675JZNcm366PylUW3iPmQMg +d+Bmi9DToXAXkWjq/lDUNRC0mvDdYPC5PyQcfm7350VOP6tb33VjLA6IYPwIiPvF +mMlXujFV0Y85KPugpcYLrInNelxcJYwQu0YMsfUNEMa2MQA0TOSiB4NzsjVk3Tbn +r7OQXhbukVRug8nkNi3jYtGo+mI1suq3aaToneM8Y1JYWw2PltEF098pLHH/ee0h +AmyC/r6MBFmNIyzNHQH3iQEiBBABAgAMBQJC42W7BQMAEnUAAAoJEJcQuJvKV618 +ZjkIAJzDKDIwUWwKRNL8pWYMnbKDGnF1Avw9U2+5VpodhismlHJxeRBel4ZyL1EY +u+60V0CliJB4I4wxh9UULVnjbH/fTVf/o+QJ6hfcZAY/IXIwSVzz7FJpe5V0jeXz +EXPwvILAGQnZwH3LEJ/lza2BR5e4FvSKGugmfdXUlSuUG192SCFAn8tpAd8PXrwi +3aDhv3REsL5lxF9nfRtOPwMxIwiqAh8XgjEgJ3gbbdBFkfWf7Q4lziE/1rDUs1W8 +5OTNleII/eK9fdWAsma5qQqSdsDuR9/eey5XCMIhv/lovIYXzZjGjUFdJLMix/uO +rlvG/cNIpy488x+yCbDSeTrM8OqJASIEEAECAAwFAkLspEwFAwASdQAACgkQlxC4 +m8pXrXwx0wf/f6lej0+Xwqppwfdxiok/2dno11mWeUCDhCX6j6Vb5lxLemBwQCBS +u53V9s6wcOT3NzkwGbl9Rowasihcg/pC5mg1o4I/mMrU63yto3iekK+0vneubm7j +Zw9dY7aLzFdQm1SLnX2zJiC8Fv0zAJQWuiS0Bsj6MZl8+in57BGUi0E+n9Q4+qnn +PVS8UBO8f+d3xlsMnOSf8IECCN4QqkI6d/RuKszBA40UzQ9JoZVHV3Kxoms6yJHc +DI24xUkVqmo5E9qRdLt+mRblsFcfQqZbfc2v1kYI6+0fvkF3cFNOlC24c2ctN80V +eMr63neRBiFSltaTCBT4Rh5Wu/jLTBL82YkBIgQQAQIADAUCQu1LBQUDABJ1AAAK +CRCXELibyletfPrIB/9NEKKNoNfA8dscM1MN9hlITxbB2QDgm5jj1Cv/3lskBGUw +GoStC8szJv8etlIxHnKafGglyZXdQycOIodccKcieZigsJA7ap5PdgAQUG6FRQRb +tt7+hWx7FYEPDJsYca5FYEu+7iWHtRNu/lNjSJLmDbMTrmwP2BOglqlt2CktWWSU +jJMx35OkO4G7TBO85EKnepm7MTtVdPr7WxtSOnsBlWOKk5a5mDSRIrofhBumhjwj +NgGS6pAyo5MxJspCH/tUEocVMSDeHRgngD9GbfMC+FvssbgJI2barzvkHvuXBSla +bf8+IF5WOxLgBE7SmeBAcC3nphEUm0ZE/qyTXYVqiQEiBBABAgAMBQJDBw4vBQMA +EnUAAAoJEJcQuJvKV618IYwH/3d5XhOyfHHtqm8gceIBiy3WU/TYsYfpKBTYDkYa +IYqOxI1DVIIIsDvoyUvLiEc+0mvnyKGCyZGFOYXxlSGGwyoDz3ABns4eEp477BqF +xCN291aP5f8GdHOqH5jm7Wv/OTwajuYt+KCtuqQZo89070hmo6JN/+okI81Wa2uu +ZDNnlxjLYtG6NVrTzg3thvouohzH5WHMuhWahF0sc5tRhbG0NBoF57zNEOL5P13G +Es6skH1evhqJ2Yq4yF7qtITrkuAPvNYoTRrsl2S3QbWzgoE8cp3oVj2m5OZ5KV6n +aTdKmuKbWmDNoh1F6cMZJ7OD+oZW1WpSWhrS/j/uNNUWiZeJASIEEAECAAwFAkMI +YnoFAwASdQAACgkQlxC4m8pXrXyB4wf+L7SbCUfqQJB04bM5e5cgL8r0/wOqAJsB +2XZssSrgSZrxJrZbZuNPdjemexR0vyA0ZaIKb7jykJnnMgRZxuHYAPcctw938BQ8 +LjYMfuvAmv4Sfs937j7x7IsoEff4uIl+ZC3000i2bERXgUbiZULx+PFdg8cdAB6o +ZUbs8Jf9fg6/qP8sz/Wo/DhHW9CW6sSsccVfORVTiHTSGA71VYR2R+WFBi9EVl++ +1puu9yYz/dWc0m33Fl2R+ehiSV0xiSQnHSpSYMUdqViPsa833z7QTvvzh/9sWNHm +28TRTdHLEXYQtKTcCeRQl3Tul+Ch5cU8WUqPN9DIRk1QNAro4yp9rYkBIgQQAQIA +DAUCQxBNOgUDABJ1AAAKCRCXELibyletfEYKB/9GIKfaAtg6rYVhnruE0JT+c/zA +M0ncuMiTSDOr/WxPE6ABpj1wAyrVbyTpfC75jyi7dLdUkzjaj6A5URtIurl4hlra +oX6yVtx/VIFlBQG9Spuf9a4va/frDAF9sxorascozjvYD8F3o/5lHQ06ZsWCENI4 +CO9zSEVV/E+Jj1njto9fl4HPF4IT37xCaNoi5rby9tnaWktEBVqn22o3TULQdZet +SYEfG6sF14MOMXfkfkMoV954tqVw7as5A3F5bDiCsNQ1eG4g2Zytw6Cl0NSQTXOs +gZg45uam2ZohiCV+FuItaj/oETzdZI2BvJV7DYTNR5SNKlzoxhfT4AAiZc6niQEi +BBABAgAMBQJDEPMBBQMAEnUAAAoJEJcQuJvKV6184vsH/03ofz2nVb2a2f2Wy35R +k83tsUOeGbbxwOfV+zxOIeNhtsdRdMB9Ij61R9EUSAXQdcYDb1LWTXOS52FdMI3E +UCax7/JY/rE25vwHn4nkqtvATLoTclw+geoRfDq9E3fqmJkdd5lsCsvbvajodQa8 +8hQQ9h3hprEy3axQNWdTg2XvszOJ1TVe/dOIzi8NIGpHSC8sl+8513Kc8u/14TSo +Om9VceuLfmrjd8yw0qfbYCytkLPxLT96DcQpE1ARiDe7kd3g2Fe86zCviHrsA6Pk +dgRPp++evAL7AAbTodXXWexST/b7hkHlT2P4XLKvjrThAUYE6Z+TEYsFiomSb/pL +zWGJASIEEAECAAwFAkMSQ9cFAwASdQAACgkQlxC4m8pXrXzb2QgAq8v2+SYhN5YN +cWApllLkWzQezrsZ8x7CJ2fqrvpVsQzJulyo5RHoz3DmiYUr7+7/IcZEQFc9BuhC +fOI+Emu26QoQgqHH36bzgAfOgyVUjQW9PqCsBWNXtgl16dU8p8TeCD6+EPktY7CK +cXwBTRQVrWlCuKOMwkCDILe+hcNCkJzjLq8I7n3sJulk5ti75Yz09B0zZTDX74zS +lleh55rj6Mff1Be/zkTucWqv3oHKUwVHylXgkgiyW1J0GHU6cky2sPjh4GvovvBw +V+4uHlJ//WARK6Fmd6avjpByvAMU8lxiRcQrTQrFSEFzBOkMhtfFiGVXg0hTLuwf +3LEthKf++IkBIgQQAQIADAUCQxRCLQUDABJ1AAAKCRCXELibyletfIKgB/0fuFUy +r6qnJD/XvAtnBvEf3qCDa82Gs03wqZaEPTrUqWmX9b15yd1HNyby4c3/x5U7Fzn3 +QN5LDQsU6pT02LfLaPSsGUQu5DGm/j9g2tEfOSfrvNssZuIFCx7BXXih7vrkXX9H +SHVWyJYsJICECKOkCtEv+eOAIXpSx8FHdPq9qSQpJGkbg5V1Zm3JfqvwdwP3ztnM +GBFDhEBy8EaG9cniFvh9IdOeifvCB924ZIo5XPgzx+nGgAbCjmta+Ab1L3m4vyIv +CXept3AJOETuBuy88gQ3+50d8MnYvtn7wqCUfHF0DO9TZpvqREqgKJ/p8d8NXVh1 +N0lV33N/u428pR66iQIcBBMBAgAGBQJCdz8TAAoJEAgUGcMLQ3qJUgoP+QG34II5 +UiH9I+e/ZOv7MleAtJWTopGFm/wlt5l4e0D9VvaZJVFGa4QBxybX1R0aJBYn17lJ +I57bULrYPrGb3Jir2/Wu0iI8RqaJRhJCkd+Gr8t0F4clDTUjQpf+/bKhy6Ax8Rd/ +DuDYNUdX5EUPVorjRMXJicQ9hYHMT5vQYtI83yC7fFKF6Et6nckCX79dXtFNZpsM +2apSDsw6JPjyUMqjZ0+MBibW4VKjM0Ac6PxsjvH8JCYgo5AW7io/qdF9OvqE6JQ8 +R7cKr72cXQi8JAlCM56HcjOwAebpWwSE40S/LzP5KB3f1KZQLxlrJlN5X2kcGh5C +CSYJbB95qa1JOP/5ZCk4Jf5s2K5yqO1yTsEgpMX6kYQjvfSbLZlpCR3ZV6we54PY +HXJCdW/Pg0rCAVjTiKPohjpinaw3hM/rPoynUfGB7puCNBLv9LTe9NL/Nwq8Tu3d +rR/cTUd+JwmZJdCkGb5F/vT4X4sGSaWMjzs9JTF16JVOZg+BG+xftBAQWISKegw+ +BtJNcS8oNhYh2PKLm/S7X4eaj2h/NJ3c4BZ+qG3qyedQ+VbNvi1HlA1xyHjfoShQ +JSfL9XxCjbJyvl4BZ0/Jt/+pqRwHOmlSaIGPi0cTd2qfWvnuoMXDSOUYovZ7iFsu +vFOauBpI7HY6uelPpae1Vkex7CxQ+HBYWMi8iQIcBBMBAgAGBQJCdz8TAAoJEFA6 +oBJjVJ+OUgoP/0qY/dla4C4S6ItcbViz7ptrjmos87/aCLFTfGqw8Z+FnfO65ntD +/GHsJNW1YV2sdQC8rwPGBWSZ4r6S0F8GSfWim/QIDU1Ddzb3U4TSd6EMGn8QN2bI +sFJcNhIUN4Rw+hAP3LIvJySFbLaX+PYH4a28LpkmJ2QOEpWK5Rp3yNJXCd9p33OQ +8+5WhiabgEHDk0yZrCERYfMVyjhOYQGIHrFS7w5kLkgLP5cOQz55m+0Pm0hs2+sr +nmQnfM/vMWr+K6p3uFQd/DrAbLdjOQb7hrC8VCbadI8XENbBMETCXPJVLuGh71CJ +HQQX8+K/4KI9xlphJUxDqCaufn6u1gfh31HDcoN8rz5rz5huN94yNDL1Sns+aPqG +uKPfpYJ/d9OjrXxiP9aow6lR/Khmty5Qlv+3X6WSM8w02KM66+IKHi8SmMkZ7DqY +5TXs3MeYk1xtNdc2tu9VI0mhO0UiI+QOREuD0T2LUun2FiF71HjJo4b76TWouSFx +g5bzNyJROdmHPLXozfJjPTED77CpexYHGnmmfTDTkAxeYNxZJqMx3IpZXyc9eFHc +tsD3P2kLTk6xcqRiWNyA5TRWEdy27f2oBR3snRVRJiudBZ4fDGlF11nEuZsCoM3+ +SOUTqnezUzLExIfaCE3eyLHYvsjdpXiOW1xXLw3QlfHbm25awj0mqT8utB1NaWNo +YWVsIFZvZ3QgPG12b0BkZWJpYW4ub3JnPohWBBMRAgAWBQI5PCLgBAsKBAMDFQMC +AxYCAQIXgAAKCRCWJIPhVmLHNLTaAJ9hNOzeiwjWjFkzp871bkNEaH/ffwCeKkqB +Xm+MgNn8x4jeJSAsmLnkV8aIRgQQEQIABgUCOcsvhQAKCRC/4SBlayFImgKGAJ0R +sxryx9cxnBVh8/BWFyc9G++5iQCgnK7Mse4x4xwl9l+n2sIqj13yR2iIRgQQEQIA +BgUCOczgIAAKCRDeeq9ulMCcf7VfAKCr0J1iWCUOW6Z+p8nsWnECWzqsLACbBUfH ++uddjfI5A1xPKyuKI8N/AmuIRgQQEQIABgUCOdJS5wAKCRApXKqUbOX7VK98AJ0c +4J0ZJH8Yqf1pF5AM3b+wzkCqIgCfUVA+624Pfy5M5MDn6HAFff8W4o6IRgQQEQIA +BgUCOdRMnwAKCRD4Xr9GJY2HgY2gAJ9yVFmle7azEVP/pAQK2oj9EWV+VwCgi6cl +O2WCkFjrUwh1XxfI2/U4pdmIRgQQEQIABgUCOgHOJQAKCRAfxIHP7Q18+tGoAJwO +znBmhHke4Slp1KRE7gutjkhmqACg1OApW5K1Fu2e2qck4UHUV13pa/CIRgQQEQIA +BgUCOi4+1QAKCRDcE+VOq5tm/brwAJ9fEoTskIB3v0+sTgY+BFhK0IkvpQCgjsNB +skt1HRw/7UOU4/U/Eo5dy1uIRgQQEQIABgUCO0BqFgAKCRDndeMk20Gzh2KSAKC/ +qjFreYn4n1oCEU9ohUuj10zRvACfeHSqn1KNnV+bZrCUIhIFdsVpfmmIRgQQEQIA +BgUCO0BQugAKCRB5Fi829/aq2Tf1AKCXVuHAHaDkDcqZdIPXlATLxZ3LDQCfSC+f +XSfUIw126OiSV7N92rBpeviIRgQQEQIABgUCO0CtYgAKCRApvl0iaP1Un1qZAJ9i +Ls4oQ2crdZjeCGMMOXHN0hP+9QCeM3eCuH7umtinTWSGYAV3FC3hjxKIRgQQEQIA +BgUCO0C46AAKCRCZyJB1G8TjK6lvAJwLu++3heukjbhtl9oni8/53a+uygCfeJAM +67FQlN7osr33gA3HcmXcYYeIRgQQEQIABgUCO0CLjgAKCRBgMFsxwJ/TWp+CAKDD +22lET5do9L6N36OvMD4bDBLISACfddEotCwBUYo0M5xoruT6LCmJfC2IRgQQEQIA +BgUCO0CtkgAKCRBdK6s7rrzF6NFBAJ9KIE9LOBkQmemtNRA4xiVU0lxjVQCdGunX +/dtC0QuTTVg05h3MlxkMzUqIRgQQEQIABgUCO0BKjgAKCRB88/WvKUmfYXuaAKCv +1ASCe17B92/RwRrkY2NS+PN9VACeLXD1EqWz8I56LuTkLtDIO+8P5oeIRgQQEQIA +BgUCO0XX5wAKCRBDVVPF4PnGNP/1AJ4/Ks+5i/cfsNy0cHTWBb8AV7PuNACfQMiJ +zYFyi5oHTVU0ElFGSPeajtWIRgQQEQIABgUCO0FVbAAKCRDXWV03S3KWJaUqAKCA +Lemjsa5yGGqCkvZMZGvrzBkTuACcD8C8YJneGq1utCDmla1VRZMRQLWIRgQQEQIA +BgUCO0WfPQAKCRAGBpzylpRX8FN5AJ4h+rSDaTZRx1XZ8mhyzmAWE929iwCeK9MG +jMJ9aiocfQC6/AOqHvdDQwyIRgQQEQIABgUCO0m8hgAKCRAOp1a1FEhD9ZThAKCa +/cS1/y2fXr0fws5hVnjnYr8BNwCgjTnOekqzSKg7cSnkFnm4u2n76AWIRgQQEQIA +BgUCO0bGaAAKCRDyD6wLe4NX5ckfAKDB+5OHEo0iXNEX1gtgEPZ9WVPgrQCff1uF +zeZPc32qw3DSLcX4uJFIb4KIRgQQEQIABgUCOzHW1AAKCRCLmMiiG+b9JZceAKCf +2r/8ldyhCZrANdts7jHUEflaZwCeOZjH/RywKe2pPBmKZ5jlDnxxFCKIRgQQEQIA +BgUCO0sVfAAKCRDApMu5h5eFaczXAKCJVPLjpBnXtWvqvkJlcM4ZTRuKUgCeLJPs +DB/LUSSZ80lSGhStDdyuKveIRgQQEQIABgUCO01jrQAKCRD+mh7DZIQ5MxBqAKCx +hrkGd+lgjZFOxMPrKPXf6pAw7wCbBp7IE92Sakh9OHjL5Zfv8lS86SmIRgQQEQIA +BgUCO08mDAAKCRBd4kmWWwNYonnGAJwIJqHLwkjbbvzN5iwyAWJqYN5LpwCgmam/ +autAJiLuOMi6ui/xhYFIGtWIRgQQEQIABgUCO1ImOQAKCRAk6Z8Q2z1E1L7RAJ0f +f+syNhDlD5b1aOUCh/p0M2cqigCcDzqivgOibvcBiaOGDwQrWC/GRmyIRgQQEQIA +BgUCO1K//gAKCRDx0szISXoXbRVmAJ94igioussKa6NqgW6gA9hNO4szpgCgwJhD +4vw46Mgw56cxE9UmugJm1U6IRgQQEQIABgUCO2MZAgAKCRCPH9/JvOCUNlSnAJ9D +6dCfCoSldhVXOAM16Rnf4yE/kwCfWNP9q0DMccuSmw4AWMMaQQQeVqWIRgQQEQIA +BgUCO0W1GgAKCRC3NaZJ4LoEwYRLAJ4kU9W7+M7I3MI6+106Pj1Kavx12wCgmG0t +/mDBa3UJEORfIJobrhkRdCCIRgQQEQIABgUCO0gJcQAKCRDckT2YXfAxZwU/AJ9C +/aobCIQ84dFYYhXLgXfaC/bN4QCfSsQB5lgZfBw3KRXCSVpbYNShoGSIRgQQEQIA +BgUCO170cwAKCRCl8nAoCRep5JhdAKCU/BtO9wenJl+CJwbzx/nmfboF9QCfWQRu +kBcyw3eeHOdh1L60LBn9V8OIRgQQEQIABgUCPAZt9AAKCRBvq6u8NX0heJqgAJ0d +1i5sQ44UwNSaGNyWJAW3HRAFmgCggL5clk3sVTL+BZ+HA6de5tskTzmIRgQQEQIA +BgUCO/rdMQAKCRDvzgtgBCVtO2vxAJ91pytlW0Kb8xkgWLIgc9NyhuQDrwCeO5Yj +5MzTFLEQEhs9F1JV49gZhsiJAJUDBRA8HlbLgAYufOTUfsEBAfVGBADRMwS9JPfa +Qvnat5WC7WnHTo9t6EMGHnufsmzmVjvd0sW8uxEkcpYU0lKOXIi2yfW81o5uWnWe +tfCjCoUbBFXzIdWNXm2iLNYgiGxYevLxNmbizkN/v/Vu5dqOHvMQjAqiZ0CHvOjL +rWHF9Aql6Fvetz6ydVHflF0aqS+W26FalIhGBBARAgAGBQI7UsbgAAoJEDv2CcaL +r829JPUAn2tRyTWNo/iZvsTePHFYEw0cdXQ2AKC8YzE3R66W31nL9dkIlDP9Wuvl +UohGBBARAgAGBQI8HmtDAAoJEMN2qNrxvNtzumsAnjdJxYxss6ezKyN+NQzC8yjj +exQjAJ9cpnxsKd0x3oYDkuGvUfvLSbw79ohGBBARAgAGBQI8zqZ3AAoJEGBSKFyo +d9l4lEEAoMag4VemiVIw0pKQrKKP8UYMRKbgAJ9wD+UwVz30P+/Ah5dkLUR+1CAj +74hGBBARAgAGBQI8GkFeAAoJEAK8QrdD4l0eM+AAn3Cc8Kh4Z12bD3V+GftCso+w +xNSbAKCNp5uBjbmCggQrt2nwTQVXWZOMKYhGBBMRAgAGBQI9NyQjAAoJEBJouCi6 +/ojlbA8AoJOEW7XWMQ4YqNzI2xvefZ/Dt5EvAJ9e01m3VZohvmaDVRaBwnZCRji7 +zohGBBARAgAGBQI8/MBLAAoJEC9Lo+/3IcZDxs0AoPbZzzlZ9OlqjEJ3MIOd4jI+ +OGo3AJ9WGKN3HDpbjdVGS+RRGPneNeefa4kAdQMFEDvwSNplgXSeA6P39QEBpFAC +/3yywJap02KDm0L8fbajdhPi6k6iWmY6MrQNeit/Gd0ILbyDFu02vrAygqJmAayg +lsKFCZK9E4efJqmkqBy2mpJ48kdOlxnfC6j1yzmJrSJvN/OhkMK5OwGIMBk1URwd +IohGBBARAgAGBQI8/1pCAAoJEOIIBVtLZtmRfb4Anj4AmRogOSt4KWhO1IcHsT09 +Zn59AJ9wjRBhA0sy8eQ75QqeC9+ziL8TpIhGBBARAgAGBQI8vIXvAAoJEPhZkLAk +iutz+KgAnR7QSEEQZaEusbHFEUC0debIe0yeAJ0clR6cG7hB8w7BB3sDTdvEfg8L +A4hGBBIRAgAGBQI9oYxwAAoJEI47c57dK8ydSWsAn3Qy50QcLfDICTvG+nGTlVbU +6+FiAKC/5JAKdzsbffUw8CwD02jumwXoTYkBQAQTAQIAKgUCPo2zbyMaaHR0cDov +L3d3dy5yYXRoLm9yZy9ncGdwb2xpY3kuaHRtbAAKCRC23LAszRpSuWEsB/97awvu +rPD7UMQx19AsRWXZWZ3NIjr+s5OkhCS7yazcAjQqH7Tl/5wXBeo8SIeD2IUUGCoj +5CcWmFPJhoaXyWho7+xJHGlnqgWUr24FS+WQSd0diN7hDyPgTLjwkJXj7ey4FBfa +ExOvwhHMmc04VBH8N54xznQDk7F/W+RDQSHvNufNsSBZBAo6uFD1xG0SMnLf1A4+ +H7Z/BS0KSMGdqiBHGfpTxXVjDbREN8Gxqx3/bD8hoHmZYY4SvJNO6GgzdoLLxa1l +bNJjCyvIK4qMEUtdPbdUM3GiJx8nF+VsLHdGp57lCywWd/moONbkrBKS0zpxRK4v +/k2qDeH70pSm2vL1iEYEExECAAYFAj6RgcwACgkQCF8pGcJq9OsVoQCfRw5nLhcw +dDSH0WAMuqfSqwuWUjYAn2jm7ayWUjwsAjkTTSUzXsrgv0lpiGoEExECACoFAj6N +spsjGmh0dHA6Ly93d3cucmF0aC5vcmcvZ3BncG9saWN5Lmh0bWwACgkQqa23+K5O +QlzBLwCePpLmUcM+pMoJY6cTW2DZBknzK2EAn2q9NY/w+NF8pMT3EsNGhHCx/LZS +iEYEExECAAYFAj8P72cACgkQ01u8mbx9AgpKPQCgnKm/8rG+TISFryKJSXFtq5A9 +U/4AoI+ao5AUmUgTCF5psohHVmRTvUuFiEYEEBECAAYFAj8QVjQACgkQ1vr63ZUv +P/8BIwCdGM0X8frOjVker85BKhnRyxMTbekAoMIRrR+p5sOKqfm70Ot5dAjwnQ4t +iQEcBBMBAQAGBQI/EQZ9AAoJEEAGFQ5ACertw9YH+QEOp4w9bnew5MHd+xyP+kYB ++4zhv/JLDa4b321ymKwaaMAUi6+/51+q9hNyKGGltfRMVI2YsTkBZK521pUe3XhA +k98xQeuSsCuVOzkof/ZkIBWUpD5ePDZ4ROILvUECEnupfHGYgJet4hjsSnpabBhS +zVsHTvT7wPYBWsoU6aXQdHAWHj1ff6ZmKdiHVMXJc7q7EgdkXlz1cytPe1Kr6HOM +vtXIu1SndaJ6RHTkFHikrzc7h+GZD3UrBE2WwXadi4j8oU4jNOPmNcgfyFTvCTga +2tziRHDwbyWjWfkSF/K0hXFZtUAA6yB4PkHam60O4HtuuvoHXX4QaqCRVRasc56I +RgQTEQIABgUCPxArzAAKCRCzNNMIli/S3oXcAJ9ksHHvb+jOBvQHWbkQqKK2RNz2 +CQCgp6vhG1eeIQjGKs8mfGtIIFnjzZGIRgQTEQIABgUCPxET8AAKCRDhhSLXfHEr +y6A7AJ43Lzy8p+Fjo85jGPAxKBOZxCOGdQCfWbE+kN98BXU20Kw/PTxwUUZI4bKJ +ARwEEAECAAYFAj8RSk0ACgkQCen5CopyTkUSQAgAh6+H16NVts1N7dXWNfUeXVka +SZ1YH+Ou1N/3VLooX6r/dnRfrFf299KGNE9gdYU4ZZbzlssVkWOjbpq9ZnT0EP0T +zODxqYk6xwLNbESTmfV+acJwyadAlTeOkcavfmPFhFjMFdh8hvAztXSSzuH0kVPp +2q4LlQcE3VAWQehH1dc0KAL38e2oJXT3Acze9coHxP5F+9qqY5+RBH2K9/Qg6RHE +ZbSbWqyk1Kp/PBRrv7reGCrKu/cknaIaMrd14gDVDaDYZpabZ1olVjLD7Xq9u2zd +IrNbDUBHuc0u+6lJDnGMxl9cKZpcXtwZW7q2m/AJZZ64JNdOzAOwoIG/Zs2mvYhG +BBARAgAGBQI/EqKHAAoJENQ8swWV/so0iN8An1kR7GXBiuo/nG6a6g80Uj8sw7Fv +AJwMPsjtifxWHhD7+oePOLFBcUKjFohGBBARAgAGBQI/ETgsAAoJEPVrJqOmOZ5z +H4sAoJdwPuP9Ras8FbVz9vxo1phsylRQAJ4+z5P2k4okmmvOoETzxYw2rnKDCIhF +BBMRAgAGBQI/EGY+AAoJEHgz7PG1REgVo7QAn0PO7mLyLm7dWrl+kFiMAKH22WQ+ +AJdBEPNiQXGzPeX+pb1DfOJxIrNBiEYEExECAAYFAj8RP+AACgkQ6iGZQSR3yvg8 +GACfU7XVDJLfngnMfPnajA88btxP5T0An2GLPaRZu7NsbuSYHj8J54VGP2IJiEYE +ExECAAYFAj8RXPoACgkQGf7YPOK+o0EK0gCfSFI/qReuVBWFKj/H466DMjaA7MMA +n0lyeEvft6EXZ4ePTkoxHsjro1L6iEYEExECAAYFAj8RpBYACgkQxcDFxyGNGNet +eACfUGJ1KOWCkkcVQ/axNLnpLOZT1+0An0NSiXPDAy2RiOa0ftCbv7N9dAsiiEYE +ExECAAYFAj8RwdMACgkQvpyGjQRgTrgitgCeJF0AAIagPvhV3irwWnVxqOfvf1IA +njfjpvbkXgf6Lt8/pYJComNLsqeHiEYEExECAAYFAj8ShtkACgkQoJD705cZn8PC +2wCdHRClEdK3fO2qBeWErf+3VABkRWQAnAm0jEAHmYKm0C4ZtqrhwpLgKLJviEYE +ExECAAYFAj8SkwcACgkQVm02LO4Jd+iJzwCeMmT+RD2ly1uSt/TlbWj2I6uyIbMA +nAyb4NNPW+1HAhGRCrnsILVds6J2iEYEExECAAYFAj8Sl20ACgkQj7mZcU7rMfHV +DQCePuYB3ixGRuyeVtRrdIwxNsERyiMAoNeZ2lMAeoX1vDmXAdxq6Q6g/OgEiJwE +EwECAAYFAj8TMjAACgkQtGuSO22KvnHhiwP+N1Jh8cmDM4NVOMnh+twEdc0quSJc +ZprPBQzZuGz3uQUKXI+xWEBkE92elHgfVo8CaSqh0N+SB40e7CyoQ5cHhdPPAmKJ +ZGiLhtliCmQI8W7xKJz3ysFPBJoVFEKaamOvsAUezTbnAcA92vkN33VW2Okw1+fx +QsYuQ7C5hdEN2++IRgQQEQIABgUCPxNg4gAKCRCt7CzRGpU357YCAJ443K7yqC3V +9MYierjg+bMQIIUFVgCdEXchjN7AuuaAwiUP86POJ7Mf9p+IRgQTEQIABgUCPxGl +CgAKCRAoxvVrgXw1aC2RAJ9Wi969B0HxCRBmmJmKY/G35+hg6QCgp4WXj0dK0QQ/ +ttQ9VqMzLbiHsjuIRgQTEQIABgUCPxPyOgAKCRC5gsvVwOMfHa6TAJ9GOyWePty4 +D0HO/i5dInksffJWkQCdEbYRoo9jgPM98b2Arb18rHRsOSCIRgQTEQIABgUCPxP5 +DQAKCRC7xxTRnGfNluB8AJ91IPyLFvn1mfvuhEksgmAvopXEkQCdHEPhku6Nleua +JEirIr0yE4DeBwyIRgQTEQIABgUCPxQabgAKCRCAdScAZahB7Q6SAJ9IF1epz2ii +OCRtFDzB++fZJnA6fACgypQnQZn5yk0FObR0umx0c0mMJdCIRgQTEQIABgUCPxQk +egAKCRBRrPatdb6Al4izAKCRvQHWhW5rsyVLurGSt42n9yqrKwCgwkaaASoIrT4N +3Rduq3Jtsyp+D4mIRgQTEQIABgUCPxQqPgAKCRBsdheMoO2YLaoUAKDu17oP9Pi/ +VkH90yIR1l4dQ7GNhgCdFjt4MegFyREUjkerk6DpcYGWwmiIRgQSEQIABgUCPxQt +mgAKCRA19mF8UTrv2fN0AJ95j2z4vBYZB+plZr9P6TjKRb23YgCeLUunT7ARJ8kk +HxJmb2rBwIr5cNiIRgQSEQIABgUCPxURpQAKCRDVTq5LyZhwsaZSAJ46vwwEDZSI +n7DMCzb43Aw6mO9i7gCgriGzSI3wbk4Fl03XhL6Yx7q6GWWIRgQSEQIABgUCPxUs +7QAKCRCJzUshYHVZ5t0aAKCF9Kmbta/PbwadSy6Y2ZtiwO2xYACeJqljQ1knbV4r +/GCyJmDn3pLV7/6IRgQTEQIABgUCPxZujAAKCRCELNt6RHeeGDlsAJwMigxlui5G +XM65FVSclFapDQs1qwCggo5t0MrmM/D6bwKgIoG+5ZH1wO6IRgQSEQIABgUCPxV1 +LwAKCRB8IsOfgHrFOjObAJwK1SDOv5xMjksadx2cfoVRUHIycACbB3EDJA5Rqjm2 +zGtoOWvlKONPDCqIRgQSEQIABgUCPxUSZAAKCRC/QVlbc3KipaemAJ9ui7yZa1r1 +0VaSwYM4ACzek5JBAQCbBPmKwLUBrmtc67jmwd9OKODgjcmIRgQTEQIABgUCPxRl +1AAKCRCUj9ag4Q9QLtrCAKDyDMh57YE3BSrDWLCIfH8Llae8OACgz+X7LZ6CADiU +UAQMvsN0PYaMI1+IRgQTEQIABgUCPxRl4gAKCRC0deIHurWCKS1CAJ4h9C4Girnr +Qf0Jt+LWaSRB6vMHbACg1Mt3M/XOvjQ3ByRNlaz5cMF1yzqIRgQTEQIABgUCPxVt +RQAKCRC7VaR/yQHDPgwwAKDDo5Oczmfsy/K+rNhp0EdN8tTpYQCgyJyfezJ3lACl +gkZe3KJSjcWvsI6IRgQTEQIABgUCPxZZiQAKCRDnyduv41bvwB61AJ9WP2XS6gBZ +e8fgWb0oSNupfrL1TwCgvDsfeZ8+228+PuOBa9EmPqn4Z8yIRgQSEQIABgUCPxcI +VgAKCRB3+BUzuw7ox3SyAJ9lEoZio+Jqvu7yDsMy0v2W9H8BrwCaAu226tR8QQgp +efrzX7CFlqUp2oCIRgQTEQIABgUCPxZaFQAKCRD0tLDMeX6/q79tAJ95QA3Y7Vha +p/yq3/sU6rGdWv1gHACdGOlr2jlePeNjyM8XP7m/aTyTA3aIRgQQEQIABgUCPxe0 +rgAKCRBGzFxj8xilarPqAJ9CVDPJRDwCTEzyxU/aXPUcD2IIQgCfUwWviRTpr4Sl +hYQSLPInA8XRL3mIRgQTEQIABgUCPxfUbwAKCRBTtrgdwTzuBxZAAKChuDlCWIgR +y0RLB43upNulVEMhPgCgy3nvJsoNNdGtApgalnD3PCtADC6JAQEEExECAMEFAj8W +hgyGFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBlbmd1aW4uZGUiaHR0cDovL3d3 +dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9zaWduaW5ncy9ub3Rlcy5FQTcx +QjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2NjJDNzM0LmFzYyIzGmh0dHA6 +Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9wZ3AvcG9saWN5L3YxLjEvAAoJ +EKseS2BGdWsetVoAoKC8/BexDahmSBm6ByFHjdnUNnqjAKCnraKOQoRD9mHRkhYL +hs6Kb6B/e4kB1wQTAQIAwQUCPxaF+YYUgAAAAAAaAGNzaWduYXR1cmUtbm90ZXNA +cGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4uZGUvfmJiL2NvbnRhY3QvcGdw +L3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzREOEIzNDNFODIxRTk2MjQ4M0Ux +NTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0 +L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZQoyQgAp7zbUXdSJjC99c1U2Tf8 +fsZqyxty2Vq4MERWsogmj4WMJY7s1nNOl2ytrovMZ8lGVFHwMuFM/GqhxkcyaG60 +4TTsBZIsF+PFwYfzdN2wiW2/nfE7EoPxYUcCXTSatz5b0kGYrQotFjxbL71xaEDb +fCzvvrtZcXNlM4BFYOo+Ad6YokzaRhE18eWnYCeqloJrkXnZuUj6g2CkdaKz8rO6 +QpdbSXHiOHNxM0DwuGE1KEVH6TlixkelWD7eWK/A7ozetrLgvfYR9xgwk5qfOi1Z +zBurcWYqtXbsthXlv7kxDZYJK8w3h3hlvPGzjzplQP5kisaKmRQnmZT2hKo0sgyW +3IhGBBMRAgAGBQI/F/CpAAoJEJEfSuaGoRjmasQAoKwxDSMg6qRd/67aBEtukTSq +cMhGAKDsScrYaTKk2OPEx2nLKt856m7mb4icBBABAgAGBQI/FpAzAAoJEO9tgkHw +gRld9YkEAL7rFxi/i3d0HRdrISimFvZdcQ+M17mzd82z+9L9qTxBDFJgrHjNrHD9 +zb4x5CehUwwEklQKGM9bRYgNfKZ3FfJs0DQ6TC8VN82cECVFfHSdKxtnR0Wu5wK+ +1Ru+517coWCmbMbWZ0xgtdZ7DXxOcS3DqgZ6Q1bKxgxR5LGTb1nniEYEEBECAAYF +Aj8THygACgkQ0Bn175Anq4i/zgCeP7srpshWEkWMk+2g9SiFjTSCWYoAn0DVZWaB +t4235TT2bJM40pbuxvJYiEYEEhECAAYFAj8Ye1oACgkQMwsDi2xjdG2clgCg8n0h +KYgMIZF8K8N5xWXyMIGh71gAn0tPowccJ9wAe1JXX3slFWAVtVNTiEYEEhECAAYF +Aj8YfiUACgkQsandgtyBSwkAfACfV/oO66wsFR0TDcsn09l4vPQn4gQAn2yuFdZj +mb9CEGXQ7OwCz9nkJArSiEYEExECAAYFAj8X8GEACgkQVkEm8inxm9EzGwCfQpN/ +NEb25HY89WP32R57XbamlycAnjgGgMgU2/Wf0E3a+KRgWGqGs0STiEYEExECAAYF +Aj8YShYACgkQGnR+RTDgudgElwCgvX2J3MJJHDzGQVnpX/j/vinbmKgAoIJDdRhp +TimIOc3ohPI/hVn/wOTtiEYEEBECAAYFAj8YdP0ACgkQ9ijrk0dDIGw4qgCeOg2P +pIXS1yy1NBGb1e+GNMfZIisAoNPZ0dwv0YkdwisRjHf6ipIQwyHJiEYEEhECAAYF +Aj8ZK6AACgkQZd80wCtfheOo0QCggPdjSLfBSv2mCSUZZ4yggajC0NUAoJe31w53 +S53tMoOueJgPaH1n+EociEYEExECAAYFAj8ZlPQACgkQIexP3IStZ2zBqgCcCUIn +qpy76RpB0CuQXtxe6LSV804An1cbSQKE9c13GiYUaWG1v0LoOnHwiEYEExECAAYF +Aj8aZToACgkQzop515gBbccP9gCbBKji8iWm2/qOW6MGBRHWABi/sc0An3h3PFt7 +h9qTNd9cF8bUBYoGIiFYiEYEEhECAAYFAj8bkb0ACgkQ7A6vcTZ3gCU/RwCfQAy4 +8uTR25zCbmIBAK0JW55KNlUAn3ausauxgUdAfm6aohyxxrvD4JRliEYEEhECAAYF +Aj8cKXEACgkQdNeA1787sd2ydwCgg8n8+hiDc4ACUTtW5ft8h0b3L+sAoJ3iaChz +MUMxi1lpDxt8qLwmv7SwiEYEEBECAAYFAj8VydcACgkQKiV7d8Y3KNJj1wCfcYaG +rDGwI+OUsEKF5kp/ibBmcJkAn3d/RszoziOGNaXR5ytxAMOuH4IpiEYEExECAAYF +Aj8QIlIACgkQAtbtIeMsT0uIogCfT1x0S7HhrI22Jh2lykvyjdD+eDYAni0cZKJq +nzFV33YW5shk6ni4RE4XiEYEEhECAAYFAj8ce70ACgkQC9tTsaLPijgiagCgibSt +kJ6yGyXjT6k8MzrrSRjwr4EAmwZsvXWQz1xrlJThOSQOJo+giABRiEYEEhECAAYF +Aj8c2hQACgkQyA90Wa3Cns05pgCfZQvXVii4ojLdEpCqPiGyPW0Nd4kAn10t1M/D +cu+sXnSafvRV6BZhxcNyiEYEExECAAYFAj8VuYEACgkQS+8mJCLfQIevFQCeMqPN +WbuTkCW2+OVb7g4Yn8sJ2b0An0atcvtqd6YjmKxIe3hL/3CD4FRbiEYEExECAAYF +Aj8VuYkACgkQlWQfayU+WOOj8ACgsF3i6btoulVD/odjXoAKsw9+ybAAnjLpzn+L +OKcgingkLfL4pQfDpZ2xiEYEExECAAYFAj8dgKEACgkQO7/Pd72LBQ3o0QCgjTPf +auFWp+HBXlWMlFTaUDmPKMsAn2tMjHeRGzY5rcMI8pEcpMkzDm+YiEYEEhECAAYF +Aj8eOrEACgkQzAGaxP8W1ujPCQCgi/ph5B+f43O3tMa+Vl2kSm/iwn0AoPBwaa4Z +MUZNuV9zoGXTUWx+8tu7iEYEEhECAAYFAj8emTMACgkQNFDtUT/MKpDN9ACcDBVK +HUdglwfB6r2rw/qo56x3u3UAn26NqtkbvIL1LjxmfuoUueIPsK0IiEYEExECAAYF +Aj8e07AACgkQKO6zWj6NzMBOogCcCfGFTxfDqxI+KRIoZ8rF71e2RosAnjYgt5y6 +wU6gTMMin5Yjm9hzh62diEYEEhECAAYFAj8e2VIACgkQkryUdmOUJl5QzACaA3q2 +IMEuTN0CNnEy7DdElR1LCYIAoItw8HTShrWVG9yvnvFxMChDPMIRiEYEEBECAAYF +Aj8fAcEACgkQKN2w/RnJtrpX5QCgzNwWHKaG9Ag3tA+Ac0KtQ31SiY8AnR/S5tYf +Bde3E8kikmYvh291nKsTiEYEEhECAAYFAj8e79QACgkQGpBPiZwE9FZi/QCeMqew +RvkzepVGeLQ3bN3I7pDDGBYAn2CFPcdZ71Hht0rac52TS3ukCv2LiEYEEhECAAYF +Aj8gJ8kACgkQA+GMa4PlEQ/XWgCgg38xjA5L0D5WkZGKYVHYwjpbXt4AoIGFFJcw +FNXNxap3dY8rH14ntilJiEYEEhECAAYFAj8hEqQACgkQpFNRmenyx0fhvgCgxOQK +p6pPVcqmPN/mTRfGpWGSYHkAnR96kY7ho5LFcaajuqCTiSnQ1IkjiEYEExECAAYF +Aj8hczsACgkQlJsl7AdEclJ2IACfWZTVuF6l9mLigt2qXNcuPbmGxVAAoK0RoV41 +Dkt9R2lIm6iqxrNRW0ESiEYEEhECAAYFAj8i7MEACgkQ+o43kJBROPQy6gCg+oEv +MFJdqjRNGMfLj1EZCOPUInAAoNYkQNGvIW+hanA09lIxWK2bQExJiEYEEhECAAYF +Aj8mwdMACgkQ9D5yZjzIjAmmpwCgp8sJU93M7CM7vsGpReoEAVmAJ9QAnjgfhStP +wYEtrnWlDeWY6hA1kP+LiEYEEhECAAYFAj8jnYsACgkQGKDMjVcGpLQjNQCfQ1Vi +vqwk+GGNSEaTkNZC8dUJn5UAoIojBb/gmfx/SGhg+ILsOm37Zm/ziEYEEhECAAYF +Aj8jw/0ACgkQlE/Gp2pqC7ysoQCgjyv6JilmZ2fkk2mGktlZAMCGPcQAnjkvcY2J ++e5S0pnWgTXPmY9G7dlsiEYEExECAAYFAj8b6w8ACgkQ2A7zWou1J69fwQCffecR +nl2OKb0xyan4c34SAiXW7tkAnjjlXUeZ1phjKkwCOxSGpzVL2dg2iEYEExECAAYF +Aj8nsWsACgkQ5ihPJ4ZiSrvw6wCfSqPnCQUf0RCBxTHwNeXoHZLNsgoAn0mmdV02 +e4GTUkP6hcahi8uktaz4iEYEEBECAAYFAj8n2R0ACgkQbyOLwk/aWgz6EACeP7lN +/AdK/F47D/RLEj0iFa3hoUcAnitXQcHBCa2V7nsdLGgBu+0RFrTFiEYEEhECAAYF +Aj8n3nwACgkQn88szT8+ZCYVUQCeI/GFVLQVfpjbILxq3QzePIvUd54An3yCiNfm +ou1ZfGQXR9ut54CFWGZniEYEExECAAYFAj8oGAIACgkQBDI26xBzGXcQUwCeIPT4 +RnjFVbpIu9/yB90/4XxGSJ8An1Q12NxzY3nguYjjeFZwPSfhV9zliI0EExECAE0F +Aj8o7UxGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz +aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRCkec3EWrRgatzEAJ9NnEz0 +qdxIzRMKnwzIl5bT7iO/RgCgjxUaa4hVcZzWdpiAONJGlAbQALKJAWMEEwECAE0F +Aj8o7VZGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz +aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRD5fPnjOkt/XQzwB/wOFo/i +eiHUOP0ZyKPlt7VBeaXIAGH0xpxZi+XJ0D5PwZmHylTIdlzJ2tlulJfU3pX1dOWm +uIa1YZsuP+ai+u9dk1QkGgSe5XAYXxqzvmbec8Rxdg0gDEdp3okAhPp9NyKtkxI+ +HNi4EgqDPIqZ1GVhk6k2Z6dfDe+QesI4FA0XIq2d1NFbCPiVenBeE0O6uQxsIvnS +HRm2PFOn1rWSgkznx25Ue9QLJP2utuxSd5cSJTL3x4E5eYDY2nXsorBOi7+SAiIo +Gdoj2V4y/5kOoyqnIotEeq4IGLuIedOCrv2Vvpn5Km+VXmyJRugOygMfafuLpPan +DBbDLjWk5ySNUaYEiI0EExECAE0FAj8o7WBGGmh0dHA6Ly93d3cudHJhc2gubmV0 +L350aG9tYXNiL2NyeXB0by9rZXlzaWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4 +dAAKCRB5BXaPdYT12B57AJ4wf88gfe8CueO6NtFQUpTHk+KLogCdFSUq/if6DUuL +nhjPKWeIy2d9WDCIRgQTEQIABgUCPyjtcAAKCRD50BTwOMmFjc/FAKCqWAtYGj/9 +8ORw1XFC9PR9am1ZbgCggGer0qz4QK2mpM9QFtR6hGkO0syIRgQTEQIABgUCPyjt +egAKCRBdD39J4OSfNETsAJ9aKCcUnCB7Vn6UHDRBruteeqRsGACeOJFIbOdqiVsb +O+wpOhwfVm3Uz+iInAQTAQIABgUCPyjthQAKCRAbsIu/KpIyJaiRBACyR0lc2oYJ +ndWEYeidHmAiR/hZ2DgMctiCcevdbfDGf+5D3FohELCZKq5UQGnW3U6eRJhMuYPc +f4z7mp1It+yEakFZGPS84J4Ftik74iE7rIXdj2BHOJFsMjgKmHQTMXkZqA//MIR3 +3ou633yhNtX0r5omEDasRVSEWO/3Zv5L84hGBBMRAgAGBQI/LVbLAAoJECyYPlrS +ilXWgacAoOtGe4cNkD8e0bNHVgJFwA39oMVyAJ4vidWutzzIpBSQzgpb19NpRZ1a +5IhGBBIRAgAGBQI/LngDAAoJEBIJY50RSqhcZIQAn3DHTp0TtM6/Zoy+HK200i// +AlJ5AJ0dCWgEobiC4oGybShrlOLlQw/6+YhGBBMRAgAGBQI/LY41AAoJEE70qYTy +yrnIcFAAn19Xn3naRkcMPidY59zV16MCX7sFAJ9rWy0RQjrx33uXDhOr51NKuHYy +WIhGBBMRAgAGBQI/M1b0AAoJEMoOFpwo+jiKp84AnjKg4ZxXKLa4krNAd5/2dEQ2 +iQxLAJ0a12Erds94F2GIFAqf/FSngVVl1IhGBBIRAgAGBQI/Hy/gAAoJENraec14 +ij9M7gcAn3/uItnWtZlo7d+OTYKk1ezOzEjcAJ4tbS5/8s2m9lL8CPMu2dJTW08o +24hGBBMRAgAGBQI/OSZuAAoJEEXAIUdpq91URiYAn0jGPBL9p3VR4l+P9kvadlU7 +UlqBAJ9QHKGG5rIfjeVpTbgdDsY8SCmxg4iOBBMRAgBOBQI/HwdxRxpodHRwOi8v +d3d3Lm1hdGhlbWF0aWsudW5pLWJpZWxlZmVsZC5kZS9+bW11dHovc2lnbi1wb2xp +Y3ktMjAwMy0wNy5odG1sAAoJEN6Fg/i9v+g4gwcAn1+sU+MuW30qSaH8ll2xLtbt +5eXdAKDOe0mpJVSxpOKrpg0KYA/6irm4o4hGBBARAgAGBQI/NYt8AAoJEGnSph3i +Y/zUvnUAnj59pDFGso7TdXsHVa4Z/q2X5n6BAJ0ZdltmQ2ZJ75nLbcwkpac3bGgI +wIhGBBMRAgAGBQI/ZGvxAAoJEGZmcXrbg1Z5+04An1D/h1hoi4RqkBtQw1/DNHzU +gAH9AKCcD+lqxzDCPqX43rX+9UCCJ8oPAYhGBBMRAgAGBQI/ZGwHAAoJEA2WS2ZX +Dm3qiIUAn3ypBZwkgxMIhE0klSRmAw9wJC+iAJ9ls0lNN9NJr84AzQ15HdtkXT4W +RohGBBMRAgAGBQI/Y6iKAAoJEFTCT7U7C7mpvXsAniCYCn5ZjWf/c74wKl6VFZIV +pWNxAJ9t0LFwcwSLiab/u/Uh+olhvaMxRYhGBBMRAgAGBQI/ZG09AAoJEE4CrK4d +1rOA7AYAoIiHcDElbjwvQYFFd9R0kOOiOfn+AJ48x7C+1Ga2DwEr9gkKIYGekQXR +L4hGBBIRAgAGBQI/3FhRAAoJEMUUr45LpAHDSrcAn0nLPfcadJybKcREJ08wx2+V +9wusAJ4xj1je9ia5121k5VKu0eEryfzclYhGBBARAgAGBQI/6RuLAAoJEGSnwKfy +zwGoWJQAn27is4CCDjyDwHxvmtLrpENuDZ7OAJ46Uzd7Hf1PBdRnBxU5bPrSuGK2 +/4hGBBARAgAGBQI/zDQjAAoJEKC+nbo7iG59GwgAnj/r1qwD6xwrm7Kw6SZi6Yc/ +mHiaAJwOpMOcian+Pp12EpfRvB8Xle/s5YhGBBMRAgAGBQJAdyn5AAoJEKQ+bScS +gofom88An0uMhlRXemnGHyQ/KRJUq5+MgidOAKCNgcFaoiWTeSJT+24Rb3DEs8+y +RIhGBBMRAgAGBQJAd7WQAAoJEIZ7+an70+uOHiEAniAEVpEe0EMBhh0KIMHQn7lP +YZMNAJ9v6NuYX8B4FraeFJvwWN3Rl5a4TYhGBBMRAgAGBQJAeLzjAAoJEMzf5JsK +Cskn3XkAnji5RM4QOb8xqOpJJjMPgIO+g6qDAJsFmagMPCtbkiKSc4dI+2l6TNv/ +G4icBBMBAgAGBQJAeMJmAAoJEKv/B7RG8yEtQPEEAJd3FInVbro9mXT3lBIpBjvv +/e6LMishN4yrjVSF82WFNTPkXYpbloqZoYdtYAdqwi8AmEKZsfQ7SI3eJAVci+Hm +7xnxPZO4oFx281jUTBZlY61j8xfJZe2eBHfPmhRqBErYk+wADOjFvbhypwv/9OQ0 +NDJuPdhu/dRBZZpCpv2JiEYEExECAAYFAkB58KwACgkQfDt5cIjHwfcAKQCdEXk9 +78h7XbMFngwWDXT5jtNbSo8AmwRHSKe0f7F9Gk4o2K4rmojcLbnGiEYEEhECAAYF +AkCWzkAACgkQK8hAFiBoeJUqkACgl0cnrdeK0LhkpZRyEODRGt0HBVsAn0+wig88 +WxVF7T64mWTvc5PfUEaNiQIcBBMBAgAGBQJAl9HQAAoJELVnlGdHP376TrMP/j0h +pFwA5yzR8l4Z/YrOwKNsmLtOhdO/CLKVZAka2y1zPv8ppCriFtfbDuLf3swnYurB +OzIsQroxt/NZA10xFmy+xOdLaL2PGWaTc0/HvD9dR7XSLhgTk00I1D1NmSep8dYP +/8Nzn5kywNlUGWPICcYQPbjQBb/+apeiLfNXfz9s7WbRg3rOCerNBVKnGL3CAN34 +rX4p27gjFtgNyAqSInzbiEoWWpj/UyIaCbMKTqo3sxSA8LaW1jsyIooPMCQTLMKH +yCQ5NruqK9GH28gfOOPUijgq0cDdRw37i9bv6+W0yfvR7SzjiKJOUO5GH6T+0Vqf +JtHDLcDcaUzOT8K5149WdTbkDGQcF5y2cRF01CYPFHJccVMyYA1apNgZLcmz5Rtg +bNgRYAiqUxzHFxQFb9by9d/M/U4sYvBIbevBOAAI2zt9Kg9PTPLQb/s6k9krKiC7 +J8nSzlLc86iO/bLdOBiNUu7mwC5sdbKPADSchv6/Zt485QLfL6/QIIQDwrv415R2 +YS7IezeIBqNfiH8gs6zkDeqaSIERlmlrsB3FYFG1N8qu8paJovSc+WewuWN9M9y3 +V4ZS6z1h1vYsunR1a7OVPtUOkqiSve7o7somGwOuB+IcG6ScPd+eFzjQgGFrRiJp +63Qoi7HNNS+FCCdyWGU/eKdoY4FMYjopjiYHBGJniEYEExECAAYFAkCctagACgkQ +Qxo87aLX0pK/mwCfTf2o34qJXBM+YXZhOs9yVXpC50YAoI5kabsup2eU1mBy7us0 +lFxrfhxHiEYEExECAAYFAkDezh4ACgkQs3U+TVFLPnwI9ACdEo928dQvBLzl411B +/3lKjJKP+lAAn18n1wjH3iTljqT25Z9sWQeDATGOiEYEExECAAYFAkDmqBUACgkQ +cV7WoH57isluQACfVLd583iOT+OpEzqaIWfN+ipZRewAnRGIOTfv9MRZD8ZSJuQd +DrIBAHKpiEYEExECAAYFAkEECGsACgkQ20zMSyow1ynt5wCeI0vp7KSYO0eLAGso +5F3pwHvgoc8Anie4Winj6dvKHuF8PtWZwSreSeYsiEYEExECAAYFAkGNFU8ACgkQ ++C5cwEsrK56CgACfaRD1Y8xF4XMe/jDZwKPeK9PfYmUAoMZ1tFUtrhTrieNJ1eF7 +dpdJZw7iiEYEEBECAAYFAkJyIrAACgkQ0/mV1Xdq/hJ5nwCgtxa311qwL0m2olq2 +TmSWc2ezDgcAni38NAgrHcDxh6DK6Z3Xl97Rcu1iiEYEEBECAAYFAkO5ff8ACgkQ +ch6xsM7kSXgWZACbBg1x9hPoW/GAzEjfM2RGW9sA5/UAoNsVZaTnFpwfIVvSVIRo +Pr6snqd+iEYEEBECAAYFAkQarOoACgkQQVLh8cZxhv8lngCfZhCCHrxpekkiOrvE +bde/+/2ZdlMAoKXsVi5dC0lZI6owWPK8aGUx1AD8iEYEEBECAAYFAkQarP4ACgkQ +qgzR7tCLR/4rQwCfR3YheOkrKO96h7w5UAtbLl3DPw4AoILhj23EPLWtD435gRqU +v6/LDFNBiEYEEhECAAYFAkJyDd4ACgkQ8+hUANcKr/nfEwCfQLF/kWIqxd1nnY6c +Is6PmIPJzIwAn00QsIjpIE4TPLn28/xzt2CmZb9xiEYEExECAAYFAkB3sxYACgkQ +bL+LLlZbOPlfvwCeJZgYtJe5F6lm6DhEff3x9hyZ3lMAn0EDRPZUKlUAjxGoJwhX +lj6VtJDxiEYEExECAAYFAkHR6JcACgkQ4NDRMRFxsE/LDgCfUC09l005ohD0dQFB +8EyWImWea7cAoKAD+Ev47KosjrODBekcTcT5wxjqiEYEExECAAYFAkI4EWgACgkQ +r3O2CKlAUK+MjwCgh2qJokfyjptF/V4+JsG99Yy+PUQAnRJQK3yrzugfybYwQ8cm +v3KQrbXBiEYEExECAAYFAkJyOdoACgkQpQbm1N1NUIjkygCcDTM7VnDqO00J0HHc +9IxMbnupH+oAoPHXDLfvpI689q3uDj84z6/3q7EFiEYEExECAAYFAkJyxrcACgkQ +3cp5nGFDTdZJKgCfaEkpttj9rbw7n9XZYb+ntvwaZyUAoJe69mqDdJI+R2sv12Ho +NQcuqmVeiEYEExECAAYFAkJy+RkACgkQd/4g/qpqtcvoPACgonV7MjBnRUKY9+H1 +9uA1fu/dNSEAoI2B2AWN8OpgpXpxhVYQk85CQ/1riEYEExECAAYFAkJzGKAACgkQ +n/JYPmgbZGm6/gCdHuBxj3DNZlbz1ScOvdbzCDIy+wMAn3bH4b9hUJ2yLTsIHFOu +RfqMN8BDiEYEExECAAYFAkJ1pigACgkQu8b/uaAhL+RNdwCgqCn0r8wIdyYxnnKA +H9eNmQQvYgoAmQHjHDaRmyg6zJOxxmy9mPI6KMHZiEYEExECAAYFAkJ1zNQACgkQ +vjztR8bOoMl61ACgr6C+EJa0KC7rnMTWud31d+uWqgMAoKxb6pZkKgoWIIwKJWsm +jd7cSxmyiEYEExECAAYFAkJ2SJsACgkQRsWY28vsX4CMpACgoqN7lvoJQOsLv/BL +kB35o9AwzH4AnjFKG+SSuj8c593EXnxLlNoUoOF+iEYEExECAAYFAkJ2S6UACgkQ +/qs2NkWy11t5GgCgopOFVZpwxRszdALafu89Cb3QmYgAoLt04ryMpBzBlxP2cKkz +9B3Al1FbiEYEExECAAYFAkJ3KjEACgkQDecnbV4Fd/LaJgCgnqWYl8N5EBuv4Ht/ +wRlSU9VOGv4AoMhL+6TVsB4tQ7++2SITLUDXrqwAiEYEExECAAYFAkJ3R04ACgkQ +Dt3F8mpFyBZBCQCfVvYk24sjRPpMWQ8KVt6NqoPoiMgAoKJsCs9S2wBSurhuwOC/ +0cMExHh7iEYEExECAAYFAkJ3zRgACgkQSsOT+6LQaTbahACgl3nwP7ZEVZ8K4+P2 +coTJCzi6SNoAoMLfgKD7paNayne0SJV5OgRaiNxXiEYEExECAAYFAkJ42M4ACgkQ +cJo/YDt+FuGQyQCgxT+bknZT5AHSlb7h7GADAc4AQwUAn1D6n+86CTh88pBcR7UZ +0pu2f91riEYEExECAAYFAkJ5yU8ACgkQvNWtkHk/awJxtACfYKUARYRzaDjeQVLD +E4WRQlpuWHMAn39JY3jbMUf/PQmbZP2oIFvt6W4hiEYEExECAAYFAkJ6TcIACgkQ +H9eQw/Gi3tViWwCfW2RwrpQ7QoP0I1aEsp/obcr1i9gAn28YlDC1FYIxtmM3wkBX +gECOiWI6iEYEExECAAYFAkJ6Xv4ACgkQem/rb/9SwVCzhQCfYYoSqONNvsvy7Inf +u3cC+lnQPQIAniiWI4ervNXN3Xrat0cTfAIxMcJmiEYEExECAAYFAkJ61CIACgkQ +BlHlJnS3xyrP8gCeJarZ3KQgi3gI56LLdzdtqkh2ixMAoJ5vhkjJZWtTr5r/TTkT +Jbbh2CEaiEYEExECAAYFAkJ+zhEACgkQPGPKP6Cz6Ivb9ACdHgVMifwG7zhKmrF+ +GArIebXVufEAn0XU4YOn/NEa7TnRliSDHRFB99iZiEYEExECAAYFAkJ/FCoACgkQ +uJQObal7aaD7jwCfTmMM+/iJ2x2CBOzELf4Y0DdfJg0AoKlJAOBwhp9SfFUxgkFu +XK0e+dasiEYEExECAAYFAkKCWlAACgkQE91OGC5E08pXtgCfX/Pla3WvnD6aWX39 +x3J0tHWcv9gAnj+Nj7nGZS7Psgk6WO03JK9XjbeaiEYEExECAAYFAkKPMM0ACgkQ +9t0zAhD6TNEerwCcD93mgW2e5MjWiI+5UDF+E7LB4cUAn3o3jI1aAkeQ+OrZaa3s +JapAo9BCiEkEExECAAkFAkJy7k4CBwAACgkQuJQObal7aaAGtACfbCMlG7zmeYdi +6z/Us3teWfKRSp4AoIMfpcTWK7p56hr/bTt3mD/UgYX9iFkEExECABkECwoEAwMV +AwIDFgIBAheABQJCOATlAhkBAAoJEJYkg+FWYsc0wxoAnRX4Tvfb/1AfXEiGfuSC +Tc9kgOTIAJ0eGc7xURiG7bSSPZXuR++JTCqFvYkBIgQQAQIADAUCQcx2ugUDABJ1 +AAAKCRCXELibyletfKw7B/9sgtUiYSEd98fN3ifX6vZg3jrxO0Y5iT1mEr4LIv4C +KA3bSBfvUlzj2P2V/kLDzrpnZ63EJ7SdP6PHJVDxdCVgOJRRDCqLsXcq9Teyvvfm +H5lm+fkzmX0sXEOAj1RH4sDxefelgzNRoAFNPBShqPkk4C6p/bPlOwGT1IqlOZhX +akZxfuger75zU6DX26HdPuSl8rpWwRecJvLxQ1iui/0JkVh/0F0pPIHFNHpFZ+UO +BjQu8jdkCmTC20efPYbMNQmLZ2zTr6QkooEKVPdz7g3xegVAbRHUyDVqPIUAv3xK +z1xSkLXZLWAlAJHnlrjqpddPZPyNehoJv881iy27Zb1aiQEiBBABAgAMBQJB3Zr+ +BQMAEnUAAAoJEJcQuJvKV618mZQIAJ7t66UzRM8uS54TV0QS4Ag+FkhSSQJV+QVx +/SisyqrCXeIhL/eHL6BsPc1d5GjpABSRDc7iNtRGiaNN+PmCdZAvzkvUh+c//cu7 +85ek6DhxstWcLPvv/5e3696xdnBLUNnNZhm0j6RoXjWNC9B7wOQiEpPuHhKOHXYg +cLaci3+torT8OfMe+QIDpgpnvUQkFs0MaXswGKgrExGtnCtG8fWlHW9gqeKpoW8K +P1iPvsZJPvl8UbxjQeYhcamxftqsWX2F5P+T3NQPB69y7dKhaKql26cgoTefqPFP +QsXCUQHg/wG7Gv9sdoT9uq6+3wPRvhCJqTApzpEU6rpCfEpPuQCJASIEEAECAAwF +AkHuv/MFAwASdQAACgkQlxC4m8pXrXxx2wf/Qn7jxnarkNm8NfsY/NxNmY4u+c9I +dgG7OfWhG6MLZFFu8h1BGg1B4FpcTtraWAxDfUwQFoDbfK0g4VsJQ5bqvdk01tpT +xNfaqGXqz3fUE9JwCWiF0M/vHXybdMdnWx9X7tjaIN6Zme4av+O0gXY332mYXBkA +s4HZT38Z64h0JMoAzjmXNO8C2DU8cXc8qZLJY6QAt7wZ/a/RLafqDL90LyNXiP0D +iCOCuWGWQENbca83IBQ4znQ+H/g+V62Nc48oNPrpWvzCscwpyUKM28x72Ho1V6GB +yusKNLnOkMayTCi5jog1xnFHs8Dbyy9R2zogrOyKEVCP+gLURiQ3OvEXUYkBIgQQ +AQIADAUCQgCNAgUDABJ1AAAKCRCXELibyletfAjyB/wO0VmHYAL7x7PVzk+SKih5 +uZ54Wtwf4Encrbwq77ceJhRrc0kOKWuEw7RoMYGqb/n+t5lsxYNvcVXWLMOQIzM2 +zXMztVk+B53o0RXgheGy0tE5lZx6q7NJ8ZETzyXUJrWpNGCo5hqghJRuOyOjrQXn +BxjpdpTHtqaicy2g92V+jIJcuZ1nt7OllLpQ36H/Ok1mDjfoP2AOG8UsQUQBgBXG +6IEavxRtjSeuObZa93FAZ+Q+0Rt+qXjHDMRaDlX7rtaYu2TmcZx+lP83sUNh2pMB +RcObpWBtACeIEoNJoZn5kqsc9evmAuE594srZTtdWNZwb6/emt6w+n2qsGFsLudM +iQEiBBABAgAMBQJCElkvBQMAEnUAAAoJEJcQuJvKV618q64H/inZnSczLuPq2Ba9 +CEqi4N1K3pY/SV2rdjXLHYi93UDv/b+3H/OeIjW8zgT4tICNxiiYNnbajB1RYMCa +kXxDJBHzUBM3BT7U2E20CF+ejX9mCn6rZNwAhX/nl7DvZ6FYpurEhHLvv1kX4vzo +AUojqCRa55l266/sImM3BcGEC/f+WN1hQUY23V+TqLMUBOd+Wo3aRVp+rxFG2rhA +R4XhYrNm+B1mX7+1hxEcyynAmxWBowk+mVUp1NCBirRrVp0PxzKhbbC432LF+UFA +2NnINs7P1N8HR5C0BLRSywRan1ASQfkpM4ebkCe1rP3t/Wm9d6CgD7Xg0BRr4VbZ +1a6KwOWJASIEEAECAAwFAkIWqcwFAwASdQAACgkQlxC4m8pXrXz+6Qf/Y2Le3ECR +8/nHJllkx2qhnvh/MIIHOau/rAowgD6QXBC/vQRb9/SpZ3aE3ylKjGM3QXFnyZGF +DQhmKmoDXZ9NANUykLroTq/qjmTiiCJxokkj1qgRoyBoKIHbBa+OBMTD795TP5oz +QF1Hy7Rcel7Ctp6QSjZ23tXpMsRPrq4FNV1OzdsON2jL0ldubJO9Rd5cAvUEI7uo +WXgcLrhdf9nqkjjwYxfTi8wh8PCOp8pa2f8cO9/p3Hrgrk48xClepib6KWZl4hD+ +x/XVjLNyAfAVIZIsgbDQFx9N1V5AOz5tzNAbBVueQguz87OztLq2AVjXlbb5Ne+h +mTIHB5+PEti3mYkBIgQQAQIADAUCQimInAUDABJ1AAAKCRCXELibyletfMp5CACO +eIDWCeLMxbKigSKoHcbJZuZfPZy/7vZ1Hy4McXH257xFt9oWdiq8y7BBdLbDQlPW +nV+rkjPkBPgRhDG3IotIGFEUd82UyQhZPAtNIpgHQF3UkBS4WqZ3iOhb6Ip8LxTV +JfpGJnd+d/JTFvIDSqGNsxI4swDcQZlrlzNY+Rn3kfqnu38iD2FqUKWvyw3SW6gE +7OtMF9E1AXAOV28wN5CvRpktdq3asO8j3Tjb6EeBv1lwg1bUgAur4302bGv3hf9Z +tre69muhHqkx18lGmXGeI/sWbrRs00X2KzxQ2sWm9yTa5/68mPOlXAYC13pQhErD +UGAMRmnO6UUTVXDtI0zniQEiBBABAgAMBQJCPUkVBQMAEnUAAAoJEJcQuJvKV618 +Q8YH/2WuatYY2ccpCjE3o1VQ8GTJOQAyWxM2oZyaoxJQeIQP0SwRWQZGu96HmqlI ++/cy0gvASg536z+/vwYytZV+ZP1ftrd5DsA9GtQO7inMN4bQ5kMgURXWx6d5ZxPf +oH5z8z9bwsnTWaZKHXXbmDdMxkFHl2APBp9sF4u4dhcJLj/nJcTbRgXmP/7LCW2H +e29A2aksvsD0DVI3DzuVc7GcPPov1PRZyRq7HeA7fl6wo5mEAHuZNARz4iywDR4r +MKFru6hKB0j/u7NJicRUvimt9NpF2k/Tcl81v2ORkm4cxqR21CTJ0aOndyTe0s84 +yH41w2f1j+Vw0fpPri84Vqs9zSqJASIEEAECAAwFAkJPwBkFAwASdQAACgkQlxC4 +m8pXrXzu0wf9G/YsRPTr9W5VA5RjEBsbt14UfZYN28WLj0GxbJpONPSvB8ujzFe4 +UxS2SVAajMn6kzdff3rXPJZjo4Dl9VedV/iLBsAqBXkNZDmaxVkPf41UYjHyV059 +HXApHloZkPDkDnq6SRRwOpNRza5FnliVJO9lMO2onXBBOp3BM5tiHI7CewNiGkol +BoEwmmGbiYfkc9Bz0V+RssmiIrZA8z5/bmUPpBUqmQ/n603Lruk4mDyI8erN/hOP +U6e03nPonw3NC0z6S6TAbunc8U8iSBl/2ctB3g6iGaXAJzkixxpRrD/UL5TQePmB +mTgV6Ifj2AYRmE0Q55YzxVy1dcDxIAQv84kBIgQQAQIADAUCQmImWgUDABJ1AAAK +CRCXELibyletfNKQCACDwG/wvdNzqgGshs4X/QLWTmr+Tafm72gA9AWnZvgYogQ8 +5Tx+FPzE3+JZmXGMwNI2ePEEYBFlDbWA1yDyX0W+9x+HCPqdmuPp0jp/P24FUn6G +ZVxlJKBGLjQ9DTMgr7MeXJaIbrk+UdhJf7JoatemjLWMhsJeSYbSMcwcGugP56+Y +QSTV3IGvKfPWlujL/n6960IGfZY7t73G7pyyKWNzvii2ss6abwFBo35zP5yP3zI6 +XjYZ8wrbdeu8cvYnNBvr98S6MS6TxDJmAeVday5dmQjz/0dDLZsENkrHp6NZU9nw +I5vjbLbsKDmlCPlg7CWGNm4G+LpXTHuYEBWxh2zpiQEiBBABAgAMBQJCYs77BQMA +EnUAAAoJEJcQuJvKV618TdwIAIO0NPJo56OKJq4EYVWvDWJNTAjLqk8NuNsE5tH9 +1yxqTEaG+QvogtxMImZLts/iBdytTFYYyhWQRqhGJJAcaXj0YJ/GvNT+sKSGXKLP +BTJABmsrGgJXCxcc5sPQ/95M/TiA2LdFb/YDdyLQNRPAcq5k48I2RoZ7Hs1W/rIa +xZvlRzvDVX8VFwKH8o3MGQs+zzLsl03CPfQ316z1b/kABCx4406fHt1SrwyeGTkQ +ACVBVA2HMfnWqn0r3inpyUSAnWhgT5X/Cg2SIrJqleEyQ/mrKBTptAgwUJ1cM2EQ +PxiB/ytu2hQanygn01VFPyR+0dmsXTZOhOD84DWcmcwxNBqJASIEEAECAAwFAkJ1 +P3MFAwASdQAACgkQlxC4m8pXrXy49Qf/bSLASg5fxEscgsSdaJ3Eid8F3492bW36 +IUcWv9U8xkCKJB99Gw5T+5B6K1i134Cm4wHhXqWLRF4KL6aCGEcSYcJum4rFMPiv +7kmH2E/e6DmiF9kk0oymVFJnuN3yctkNpfA9ovrXgacJrwzgcy11t1octK9RDiG0 +qBxCD/qYHgf18KJK9+VK2vyMzdm9ZqKwih8+XvDnNkdNrEdSJ5uIULl/TfmPn5Zm +uQ93s+ZdnFflaln3smuTHxNrp3K8uWu3IJWmX74KUn4lNXAteKWP4adqFBEVzbLz +d5fzs8XLF/w5dGC3iS4CUfqWpDfulDxe7ooxKoV5Y/QnmZkK+VI1PokBIgQQAQIA +DAUCQocRFwUDABJ1AAAKCRCXELibyletfLeoCACZ9K8f2WtGdc1SeuQc1yv4BN72 +pr56/Ks+Raky+tOy7P+yLCBIEV9KaeZj50LAu3CnESNn6TLix4a1gxaL+68yHAxU +wV5S341m4bUjAa1e8ZMVhdJifsqe8w0TyjHx/yJ/ciZWWZVIEgKTNhzxdjIGSn3l +q29ow03AnatRCz/aHhiAzeeHSsEwW1Lvr4vz/isPMvWDzJSnofUUD5jgXWCDMBat +bVVFsCvdb3UiLJY1Yh04ZYGFIiEimHlb7fLaZ/pDosL70SnSYO/upn3ojaSrRITC +Zs8wsUfKP5icv/eqAdwtSlpeox+mSLvGhv64S1RQFZtFJRGmk9xNHDV8CJxpiQEi +BBABAgAMBQJCibZSBQMAEnUAAAoJEJcQuJvKV618dC0H/14iIrbtLfDkh2Mcc2iF +s0uD+l3ibF8+qtfiGFZ3rC82GHGNrpZLgbALsdGV4o1BmVrLMZ1d3z3UXV0kxWCl +YVZ1zHLx+cDRXYT6k35iXglxXtmSxUN7Ed7Uc7SN5CCO9neoi3urr9+lyjZHqFq9 +6lpFP0T85/BvTBt/ud2CR/+eo+UywI7wjDEIYc0qo9JnuGHd0n0FqNO/Rm2yBzf+ +lWyvdjgR0+6HHy+tfMehksHC5+bupDAfGoKuzzD4qp+fjtTdzAYEuoXg2hNrc/8Z +qEFPoMQXm89IFRorEhxJbkvP1jQObUFSPilQWXZu5F+WJOEVXZzrQmUgqC+ZOfS3 +bKiJASIEEAECAAwFAkKbgfsFAwASdQAACgkQlxC4m8pXrXyfyQgAtHrfLtlX0E0n +OcawD2qd5HAFhvdrTy48JP/Ue2JitlyEAWj9QpC/y+aApk62aLstUHdLg6bQIdsG +QiQwR6euqMOuolN9JqfH5JXyvt5M4zRlkJjcHGLv/x+cZuojFz9acHYTLCkawm9+ +MOhcy6piHVW/Fh8E6V9Lb9TMqDT1OTCfw9najnKmnA5dulvf/E3Skrv+cETp7vq+ +g7UC9HvucV7i2Dqj466WSgIEnjibenqeZfT6wovgs9dFiACEYMCrfADylpT/gS87 +35eEpWXK+0AnPiasllmX5LPSfaDhKPSOKagp89ILtddx3TlAEZFkERMi5UdamNCV +MI8n8ft6O4kBIgQQAQIADAUCQpzTCgUDABJ1AAAKCRCXELibyletfGzIB/95hsVS +uQ1XiKqtMZPnUW2U40vNHdw61vD5wK9d5GwCKMfUPcVYWaTCHCNM+23tTAg8kVjA +dOHGQlRKW/gfQ64X7xhSu8Obps/B+lwy0gVkjje0rVaaZOzFzmAztxXSBzlT95wt +KL0VKdIt1R8T4Dxc0iPlkuvHWrEzdUbYkBjrvccXjgbqa3znaEQysLGgsEciyl+1 +yctjfxs5WoQrItgx64mKfIm20DHP6w1X95qY+ZATM1JUfykXFMEg7JNqZ6xlYFAX +bGChrspTfq9nUsyoXPUncA97zBGVLM5i7ygagIvt1YeUi0+g/ojpXT7MsoTROHD6 +66Hamw2DzkA6GhwHiQEiBBABAgAMBQJCr+ynBQMAEnUAAAoJEJcQuJvKV618+aoI +AJIsrFaXQIym1cznFJSQlevgnfrTitD2vRwV6uWSMQOL8fkHJO0QrqrpmvzBPep2 +A77JosZQ+3kflkbd68SXvY5yfpxxxXF/eLv1kXKaGqcp2VYOMJA+QWzQqfsU7CVX +2nkpV4tgFqaq5x9JJ9NZdapJiDRsSuuqPbAdWeDufl9tFVhb6ZBiY/x8ZBR/4q+9 +rWjHObn3JS45Z+XQ5fYEVk+26RkU89fGuSsGpaF3zgvEM3lLmxhfdY8MSegg3+3S +zArY1V6nfdccN1n708CRYXXwoPWPenzGgHOwbBSRnf9l4IpNxoH9Bjcs/YM7dlR5 +GGD415gq1w7YysVJFVoiI0iJASIEEAECAAwFAkK0j2sFAwASdQAACgkQlxC4m8pX +rXxWRQgAkabF23WJvJt+OTsYRL21GaVNCSijVTQZRU8LI+nIMsXJGDCoHPtcPiQz +2/nXwyq6YOC7VaXJetShF5souL5w5L8it4oU9Awk9FScRxitMl7ty4n+lU+JG7ao +RfeuaDTcYcai+CXsed5PynPA55oKP24c1BbT0rBaMjoi5Uq08xrCqOSQloxfCLmK +/efJOWUzHRE1MtyFr+eq9vbQvlvaeRusZbKBZ7Gb1yC1+qdzv1R0J0vN2MPUO15d +5XhO5UhVgKUTIojb4mEd16r9igLOn78HveKh5uVX63JrvOYUaL0jO+FlJWdBtKMu +Tgui7Q7BRqJMs15fnG6roFg8gLrWnokBIgQQAQIADAUCQrc1vAUDABJ1AAAKCRCX +ELibyletfHtAB/0WPN4Sx5UVX8TNK1qDmx06B4zy5dcU/wqgWIUCERZheYStCsDK +X/VzHYladi0dAJKoL4+IHNXvEaavtU7WlJwYThD/MwaNah6jSyX1Cqu6/A96QoQl +4AVs4fPu7WGVje25yNfPZBdJyQPNVfipM6uRL70iFJ5BNIIzhRjlPMX74rj/vnU8 +kvoSWYvXmPn4Q3KLv6tcfOn3Mt9wMZJSH63sv3jbmRE9Cm0TgHa1UAvgOxWT1A7c +Nvhrt6Fy4bsxL06QG0xr4PO0nDbRGQ21yobITMFukfQx0jlnWBf26R8p0D1S1afm +/TG6x7Ilcw8NkV8tFH6eJQ2qkiRySXXgcRnziQEiBBABAgAMBQJCyQdJBQMAEnUA +AAoJEJcQuJvKV618kk8IAKQmFB8do2eq8F0T1rCsZrMrkjQFhKTTXEWJzg17HFjx +5brB81L+LXd5LwTI4rL2C5doP9N74PuAV9a9cmiydw71vCTnzSi1uhRqnBRMmM4b +vSOE50HMIQsidGKEzSVySROAdvYyaBhVdN+uyPAncGz3DTq0rUjoriW2DAxHMJLu +l8m8iNjo/LogBx0KRcWXr7xPR6izOVIqINm5xMwrSBPoR/PWuG7w+ZAKhy6IUGiM +F1prrMwG3w3b4bXDcCyJKgA4jRhD8bBWGWhR1s532ZLmvSwWy4xf1LPWlo/mEM89 +wrGZX8ylQ0JlZ7grLaiHNHX3m2lFb+IxwRKMfEWuu0uJASIEEAECAAwFAkLQ+IQF +AwASdQAACgkQlxC4m8pXrXx0WwgAkm5C20y4dWf9Phy69i//dNWwShHBK13hIO+F +ROqPfJxQYdDpCGGIE/IGhako8ofNYCIf860qto+/gPWUOX7ITH9SX5v2q2nL+ojZ +D2rI4vrFHER2Q8mCQvNCT1D7BLLPkAV3iKtqGSHRC0mAZz5Jer+ejs8wf2m6fZTi +5tOk6iRFMWPGVCX4rGN2Qk0R9SqTHWhtZFK4LShpiNxT6fAnCRBzdepigRid/skU +ggXqjFvezaJ+BzQBhJahlhnpKtEK4fjAfdZDtiIpowGbZgfIIsB0HAT4ujj3UDy9 +kOons0iEn/NR78v4oosqz0wxcqAZORA/tldmoqlQK8Ix84BBpokBIgQQAQIADAUC +QtGddgUDABJ1AAAKCRCXELibyletfAkEB/9LGSHXus/kR55RQ9XIgbNbyI5opA5A +eiuUY7nAF9n9pcg+xB1GVGXM8yMs4lrU4Vh+vSKjtH2Gocs7TwpHtBItbVyW+LQC +nEOyf+q4Orj/vhIvfeNUuyFvNCHIwbU0evDM59Vc9p1RkhBD6vJtpCX2bRdUMGuW +9eGTSYlxDMamL57Tpgm0P1Bvdw3gYnfk3H+r/MRGvQkImEnr1B3WqmClB0Fmajs0 +ZbBkuI+suwyy2lrXA6e+3yIQEqHCLSG85GOQG/xIro1nv4W426NhXY2er8ZKSiWY +gOddKe5txPR7h80lA3OfEmOopNwIuN1ld0BLltY3DBsb8er/gRDyR7IFiQEiBBAB +AgAMBQJC42W7BQMAEnUAAAoJEJcQuJvKV618w58IAI4eyED6P9wFdR96vNQ4oBzo +cJXcPXcC0Zrw710MTXf4Zn6TfvB3UJitboab5fEYVA5RUy1E61SiwLof7frF1XW7 +CClp+ugsDOxyx+GdFGV0q+H/0mpPbsXqiBMMB1J83uii76dNGBDzZt0z9c+FylzY +WAziq+1NTQKYcHqJhENbV9ZGvTYAwCLA/pB6kHkSJRIJ9yPyg8vtYy1xuRI5hi6g +OoA61rMIgs7hFHtu938JDPt1tvZJFt7Ux6YV3rAOuDmgK2Gvgz9Q2lVg4xhKd3Tn +ycnjD6scS1T3zWcCKSrW3v5+AZ9HKvgA1kiJ6mknSbVImxJ7LKHKLsrIy/sJOm6J +ASIEEAECAAwFAkLspEwFAwASdQAACgkQlxC4m8pXrXz1RAf+NfkWCYU8c/Gowyl0 +u0/tVxeFPxsx1GpKjaXI1tVeg5+Ov4spaHeZpYjdIO5kRNGSzdyVXkO1Rgz9RK5e +V9vClFEYH0l3QEUxM1QQMZqUZAbmxH/fN4vnr44a6ya6ICLgn8I6InHFGFO8t9Tv +KTA1eqS8uElQqUH1dNG5rxBqDjMOKjk0E0InAaIOeDHdvoBcVg0W/FMzlbhKPd0e +czpNyOtonq3z4EracangmCmDxEy2PjtKZP6LlMW8gvvnzIqL77J2I8mbC4vXwYxu +mgne9Ghou4IPqZ+Lb4cBaPY/wxxZ7F/pqGIwcTB0juYqsT0qZ430LzO8xaAb8Fry +X6le7okBIgQQAQIADAUCQu1LBQUDABJ1AAAKCRCXELibyletfN/KCAC/k7OMxhpo +XobydxOLWRJWucKrB1zTnN0c3VBElE2zZ3FUbzAEuCNjbCzbc7iRxKeDgcKtktFd +mnM590InYm/7EVdT9r+TB05mFhPwrCbne3UcSB3PBd8ZB3o0tpG/ZMKsdYnftPKJ ++voqpzdmiNZJMWYdeIIluzcBuViLzZhKnm0lmthdUOl1GildNW8hqfbhM7q265Rc +jwVbTm+/Rg5UCDo1uFv94xqjO1g7scgCl+N9jjFBlRRin3Y4V2fTmNIiEITnomak +DvTmlhs+yxd1BNYBau4rLXWFC6Qe+L9xnNWefQOLT98NokPU8RfU9IJ5OI3ColvA +r2ITEqQocqeuiQEiBBABAgAMBQJDBw4vBQMAEnUAAAoJEJcQuJvKV6182VUH/2+o +TFYzVeLuHJzhPQGI1x00Vh17MAYODp+4/bQsc6wrRykuidd8tklc/BlvPeWqjKDu +W3e16cEf/05GMdGpsYNMCgzH6SOjZ3yycNg8y3rB8BABJ+jSCP6IoAUqqRUH7fUF +VzA1SBTOkBwvZ1oGspDyYdGtn19ForXFNu7YO85TRFnJ8JIH3kNBXriaemmrfSi+ +9UFtjvuC0gH5ow/3p86GO50DVOpFzATBNi/q69FOWK6XqX8EW/tPqMZFP3MIWD3F +al9l54uL6s8OLulRAhtarpPIpAURFr5+Ex0euKbqow/EBRPlQHGcutv+ONK7n/6g +gpeentNDAyaE5kFdAG+JASIEEAECAAwFAkMIYnoFAwASdQAACgkQlxC4m8pXrXwu +oAf8CxBZiAGstqB0M1IddHHd19CvGT7zheJWn3BVZpsBPvM/jctN/bYNKtnHu3IY +DGUybNP8jHeeYEswj24tSPaZ7MT54LhU7HJdKwdYtMUp+RrBFWzbIJNpz69JwfPE +TevT/IV7dnXz3uak6ZDDXRCjL6+ETbN37uAdXLASh4MD40Mfd9r+fY0Ayov/qRmG +Th3Bxy9/f8ZoUz+CL7PllI9wt4XtX9su54L966nvcuODqUR5C6x/bw5T7897Wmkw +eh5ICdPTg/hz0B4morKtJnayy+R106byjHaHobfuth6juGYeYbHXjzMNoWYoKqDZ +uk3j7j69aAFZXzC9O69j5T8glYkBIgQQAQIADAUCQxBNOgUDABJ1AAAKCRCXELib +yletfLt+B/95xkZZwYbLRDRw++rj+uO+RmjUyHxwx5jQh2mppbOhgo2jS9s0DLUp +T3gAPm68YTVjLxAYV2hDcd57SNI7EGqRU1bQ8s/7G+Nqnc9qgf02BXWaQNDZJ/QM +dvu0TIu+IkQZcLTqo26ROLlahtNNKDMY0PxM1zF/cie3fztnpHATNuWTYYGeZdOa +CeGYy5Oj4TwNhjIrOIINPPttxO4+T+iShpHC9HVjtC65+kK/m9wAYM2CxUahSTft +fweoeIKGt/ML8ON3Pe1u0dafqY7AUiV6PYUkg2QPsjljCQLFxCxP2vyPZwHc0Ftc +ISPcRGwbYyXaDsFSkUTJAQS3qvWnZ2ayiQEiBBABAgAMBQJDEPMBBQMAEnUAAAoJ +EJcQuJvKV618WlkH/3bC1x2yaa4u5hfUDR8S0ng4Y/uXYM4iLgARNUciZw7SV1Ke +pE5b9cQDYmez/tmEyUfsZWthKQ6+Ne3vBLjLSLmNyNTiO7YIWc65RcJblrS5+fVt +Cv8jGwFr/KlH85EqgRM0QVfZc4vPz7FoIzFbj2OeucR1dnc7AMEpHVGJAq/TEKNY +5uQ5EAFB6F6KbG2mMKlsISoK5v9doZnQN9mBYnhJ3qhBJwB/DjNMG1tpp8QtCFyC +xZAYQB/2JGehFrN0q9iU/W2aCbEvTTgGIuLGEOLlrplR2MHgWyiTiFv4eF8o0mAo +yw80Gp7MGLZ3oKk4zbjbKp8S3BtwnMyILFuN++iJASIEEAECAAwFAkMSQ9cFAwAS +dQAACgkQlxC4m8pXrXwXEggAua/5xOdeyymVGt/C2cmoIZMuKQX6o6mBb7Q9NUXY +durcIAicopYFNG4FpIb0mzMdsTQGXB1KJrfj5f0fUp+rtdMWPda3ThMAx7zMK1Dk +uoorAkGGiCCMqmeZS+9TvcLKwHZTr4t1u2eqWVvdM56u7VhNri1to1Zw8JE60zz0 +ZB6IhvFBCW28oCOkNIZnergmZi0Sw9RdUYIphjes+1sML43YE83jaFGZCcrKc4/J +qBqj1ZZEnIjYy6MFoxAsEEnAr03Jpsr7sA+39+rdWgbYS/OPOFqRpDtr3kFQZFGp +M/rN0XnoJGFO+m3GQCVw2RYNn6yNZOGbN/NI+bNySBiFUIkBIgQQAQIADAUCQxRC +LQUDABJ1AAAKCRCXELibyletfMZqCACizLb1k+yJZKYe8sGCy0gb8Wfr5wIIoSDV +KUsOo4VrVbf4Z+pVwzox4BlF2WyQ8oMdNh8noCxDFsQurVthNayiMwTEWsWcKvGV +nUkl04scwcC38gy07+dP7vzuerpvKwzBNwBeFmT8sw8Cipa8RlXh56l6rXIyCyuZ +WMeLzfq5UjsYXax3ktQ4VtFDOU02aXpkp1wgQ5xTFHU4v37VoNkuzV9UbZzLCjZG +ttPaNNpHfIgsJSV4IFAcw7ZDr8PToLQ4PgT2CD2T1/DD7JMeYdnKP4CntUXJPN1w +YbG6FQtz6Y/NCoEJofRbVJDd+jh6lKbRbCDvA2dv8rS553knOqz3iQIcBBMBAgAG +BQJCdz8MAAoJEAgUGcMLQ3qJosMQAJ4BAkBO2LE3BinWKaIrjFcYExtn+k0RGtFI +b4zQwBIgOjH4Yam11zZj+YAfzOsvl5aBuL2Yc8bZSKR1WMQ1581cMSAnps9FWJjJ +rEp8FG9by5DKTI+onYW14oebiO+VJOciLrRnvdnE9+Avx18xtuwfMyRAADARggNi +ZnTXSSx/ACiE3k5/TfbhIaDw0iaE3+IUPfkHkhrFyShvCpgUNWEX+99KJfiDbboA +OZ/BDf+MvjxY6dFQW+uPyKH2YFLxWeENWjAQVgrOUqchVStmKoSmwZ1Iz3fXJDgP +WLa/EQm+13J3uNo7BHRht+hxXwg5ydoYQoI64nkWaARaGZbTit23PyBVK3C+Gqc5 +k9xEr097nGz5aNRym3DiBQTJgRkqcrwcgqXjFjeoyGJRIFOEwTqN86YGW5MXGzEJ +3zQd95eEphTVoI4SdAIDESEmds/khbh8fGo6pXYqC7Kt/01CRoqsDTczm+X95CkF +j8Zr4SSm9xsN7VheN3E4eAPLuZonjrC09AblD9jpfJQIdH/EpYj1jaqPycSct+uP +xXYuOp+2btiKvUQWU1Vy3hZ5lb8J+A7/mzom1Zpo1X6Yi360DiEVeuRw5i+/gp+8 +ItqRqQUXPCZ4h1Fsf1tZWe0doFqhqX7wCW3V8zkvtAOiBtzbjJMVZpvFxPIde2nf +AiwUNnyOiQIcBBMBAgAGBQJCdz8NAAoJEFA6oBJjVJ+OkLUQAJWH09eK8jjgL5Yi +l4lGGqAY+fONk77HAusNllQ96NcoSe5gq6awiB3CEeEyVai/RgoE34OesvXvMQYG +3+DESl7D1I1TLMCX/OSc40qqgmXZ3Gfu0WO+PPZBx+ykCFqAxtFUxrjW6dCPTwPp +F2I7qfcExYBI6640BdCh+hAxd6bgLPbsid0RQgKotdqyx/R4bliRitQXa8ODOz60 +hK9AzQYSi6ifaBSN+mYJ4YTNN1tqrsg5Q0MrGyWYMPxTkdEqfVsnhF+CO/Ca9M3S +99kM13nBCG6Ft8fwhIBg85ZwfgVIo2PDdrS7xjQpUYpW1R1QeZK/b5o0fgWNikes +Mb9zieN7GKtNKQPp2BsTHVpkvj9d+VvoGSYX+BS59j4d9I0doW+0XdGNj6SWLBqc +hZ4ybMd1ysyc/hUmIT/aX8JhNVA/Q5PkgmWaYV1F6P/xjqx/RG2IMr+9OnM/zW7f +nVEz6YQDTuADZESCdcuOd9O1Zd1Sv5UOeWRfuYE2jYGx71TKIywXcNFRqPxeDE3u +WTEGRDcEXQG+bs1d+1QvXitiN0zDBgq6cpfNIbXaWc/HIg8LOm21xhDFAw38L1fT +iTXrDU5UNhfj3lrkvgs2WOE6pRjP6ve0GFIKByi8ezb55iZTNyUgCPM0f/mVZrnK +LvKv4vVpKzrCiwysGoQDck5DN3oCtCZNaWNoYWVsIFZvZ3QgPG1pY2hhZWwudm9n +dEB1YnVudHUuY29tPohFBBMRAgAGBQJCetQiAAoJEAZR5SZ0t8cqDUIAmIfLRBeY +28PXBqwOJVKcxtMedw4AniDcMjzOXhPz3hkFvZgQbgUfRF2JiEYEEBECAAYFAkJy +IrMACgkQ0/mV1Xdq/hLXdwCglqvBfuZOFvU6rilTNrhikQ98TbMAoMZYDP30D+Yb +Lo/Ho/UMSAQkdnR6iEYEEBECAAYFAkO5fgAACgkQch6xsM7kSXj4wQCgrh5j/Tcv +BsR+a+BgccpQoIuT7ccAoPGCTPRGxas30yBVzBhEUY3gpGOriEYEEBECAAYFAkQa +p7MACgkQQVLh8cZxhv+7BwCfRDPF1Vwqo681qBtkxdnuu5PgZN8An3EpFV31J/bu +x/DERGQ4bJrec5XeiEYEEBECAAYFAkQarQkACgkQqgzR7tCLR/5w7wCfQfOvnVHB +y/M/E48ZfU9XFr+2no4An0f0KNhZjZ3+mUaNkrkkYQoQEC0NiEYEEhECAAYFAkJy +DeAACgkQ8+hUANcKr/kWnwCgi0J7zAVwn2vZufTJ7DJvIap5k/MAoJI2Y7Z65NW6 +esVYS5BpLdfJhe0IiEYEEhECAAYFAkLMsmsACgkQzN/kmwoKyScGPgCfRiKtZpTN +ULwMA90Do+UjUczBO0wAoJzLIAF9LX9HWyU5UXidQt+eZXrPiEYEExECAAYFAkI4 +EWsACgkQr3O2CKlAUK9TxACdFn3HOjQvqBwQjFqEp7QlGfxw5o4AoIa3SuTTOtLJ +hBmo7527ddmzrZzyiEYEExECAAYFAkI9iLYACgkQ+C5cwEsrK57aVwCgxrua39iO +ij8hZ0xyVehvqCyl+6kAoLyqLbJ5dllzfRGxjxjc1+ppenTGiEYEExECAAYFAkJy +OdgACgkQpQbm1N1NUIgOmwCg2dPgDcObDv8rO/MGHyZa0lqHacoAoMXv++UJaWXH +bNWSPFIgOpfxTeqqiEYEExECAAYFAkJyxrYACgkQ3cp5nGFDTdZrfgCggGiZtpj7 +wpw6pVcF8tfswF4dsZAAn0rxNKNXXN9u+IAg1OuK0rsec7cTiEYEExECAAYFAkJy ++R4ACgkQd/4g/qpqtctw4wCfQ2aNzJs/OYv1an3nPikx05iT5ocAoMyo4m6XmHDZ +hphBvK8Ua7Z35YqxiEYEExECAAYFAkJzGKMACgkQn/JYPmgbZGnZ2ACgh44bvHWX +Bq5Kovj/7+R5jxP/b5gAnRrTD5WtARrsItSBl+l8RkjZR5h5iEYEExECAAYFAkJ1 +YRAACgkQArxCt0PiXR63LACeNrOuAznY8YMEURjvIdaWgU740gcAoMPjKBTCQO5t +eqZcyel94oBR0Cz4iEYEExECAAYFAkJ1pjAACgkQu8b/uaAhL+T2JgCfYtVnAwrM +axYJghFByu/cdRN9R80AoKe+Hx0fHM1sU8IdHtn7mIMTeAt8iEYEExECAAYFAkJ1 +zNYACgkQvjztR8bOoMlUowCg1GdaFpmIOr/UXyCC9sDcv5w0jBIAmgJO1NL9gTzk +7fgy2VsYJhOP0qrwiEYEExECAAYFAkJ2SJwACgkQRsWY28vsX4BR7gCcDRTfolut +/zVq63qgjjcWr4ac5SUAoIvk6x1tksCp++oYS0lUV0MLjb3kiEYEExECAAYFAkJ2 +S6gACgkQ/qs2NkWy11sIpACg0Bp7T1euRDcJH1N7XLe9WbR+DwYAn2gG6nJz5C7N +uqlmPJVZZP7QWRIJiEYEExECAAYFAkJ3KjMACgkQDecnbV4Fd/Ic+wCdFYiRyNeY +PO27a1FX0hWChEWz09AAn1pBfBLFI54DoZvhBzhkarBXJLfyiEYEExECAAYFAkJ3 +PxcACgkQhCzbekR3nhgcPACfROmJv+sz86kfYW8k0saSqBzvBcIAoJi3RH+RZB7J +pP8/RyQkLZg4aqxNiEYEExECAAYFAkJ3R1AACgkQDt3F8mpFyBZ+GwCfVW2vykWc +NnfmrcUOej3v6Lycw4YAoLUIrGTkO2/X/673krDv5ixxNt5EiEYEExECAAYFAkJ3 +zRwACgkQSsOT+6LQaTZ+EQCgwX2d3Hzpj/7h3eh9Ws4rYpgBS+8An3TUCtOULJ6c +HhlDNkzXUFquLKhgiEYEExECAAYFAkJ42NAACgkQcJo/YDt+FuEFJgCfa34UiSTn +9ecrC3YFpVlvA/c24b8AoJX3QrL6CDxh/PEwni2CObFdAcVCiEYEExECAAYFAkJ5 +yVUACgkQvNWtkHk/awK/gwCeKnFUSolfUl09apDaZaEjhn65dAEAnAp8o3erErE6 +S+Q3+WFEls0pG0BTiEYEExECAAYFAkJ6TcYACgkQH9eQw/Gi3tW7XwCfY7He1SCb +I23NXL/YN/veA0K949sAoN6IfvdTL8TD3l60t7ka03IJZBtTiEYEExECAAYFAkJ6 +Xv8ACgkQem/rb/9SwVB1oQCgqYf/1H9CiSjXlhplc1EKcCAVRW0AoNvQT8M4e174 +tUv67zkr1nA7Op1GiEYEExECAAYFAkJ+zhMACgkQPGPKP6Cz6Iuq2wCgnEn5tGWv +mj5RRPAlBIS3P/f4MwwAoLeBZwU3TrtfCm9fqnoQnHqR/xr8iEYEExECAAYFAkJ/ +FCoACgkQuJQObal7aaB4+ACdEN7g2WKpES7QFp/ALG7lLNv9FKIAn12MSR1vCwKf +bRjh6dSFOdbx3Vq4iEYEExECAAYFAkKCWlEACgkQE91OGC5E08qqkwCgnU3zcfUR +v6YXqPXSPBOQzK/8LoIAoO6izGOLUMcMd0KB39jmLNuA7POliEYEExECAAYFAkKP +MNEACgkQ9t0zAhD6TNH9mQCdFQuGRjnVuD5ZfKQcUrCIb8j1nfMAoIF7CHjeo79q +fteokg+d7CAYq0RZiEkEExECAAkFAkJy7ngCBwAACgkQuJQObal7aaBaEQCfcq/K +IVT7x6TmmsZPZJJjYiYyi4gAoJqwIGt5DDLb5tlkzpmwvPXEJgixiF4EExECAB4F +AkH04tYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQliSD4VZixzQFKQCgjpjp +s+IXSNkiiIsBkOBuJWKFdnsAn1FUSErS2Ox809VZ0JMmas76sa/8iQIcBBMBAgAG +BQJCdz8XAAoJEAgUGcMLQ3qJD9kQAKoG4PeRjVwfv4W+es+oGKd4AmQeQDW3g/sC +1obWPd7g9GAhITTIdAJ/q1Y7qauaeUa9zYxFfMEREHjfwDEk+tXU5bkg9w2FB0iD +5LxyNiDLIhaMWMg/tpikJV+m2fq+nCba67RYOmKTcAjBn4T0S6qmSwyNEJguP5+J +jEc1+dzM/w+r4hlgKbb9NPQa1OXQZVoEKa4iN+Hn7Grr01bglEuGzXv2EU8QM3dz +bKRWZxafD3kYaoU5fyP8fG71+7drqEZoP4A0cvHiGUaYvGIu0tKp82AW3HMMi4jL +6aNt39fJKYlCQOjC0TeiTKyEJ+3dPTMr8692xkdHXc/HrlrQBv+Wlu66B44/wZly +rmK8itvjrqLHO3yuqI9j+88iE5CRfjmkZw64aCjlgrA+JHx06QnPGIMptjxQFh5f +m/Gt5VToAEbvYEoQF09rgbG9osx0aqrluwh/MhGhKze2bmxV3PnT0xKeC+950/Bz +jaoSd80JAP96gzJSZE/hjLWUg+s7BnHi/FU5yyYUjB9olhC0UtZINiym04uuLkPj +pMkWEVSmcnGcFgd2C6fQRbEF2ISB96AXB7i7iFI0ZnzrBlCqIYWMViCT5mXKyPiK +XU7hbFCJM/Yz4KyEF5TNDnbstvneDLjwffoC0LmxGhWBA2mMDAkrQYMyaLz2mU73 +kzEUVWDDiQIcBBMBAgAGBQJCdz8XAAoJEFA6oBJjVJ+OD9kP/2Hi0WGp+w3nqlFR +qQ10MKxOElTEJIErPf8GWlM/m43GKpwtyf6CbNQ7NYwEkpAGoq6zKMaQy9kRxtQI +FWleRMDsrkmpGjvqmNqkaNbEhFEx+bApPtSsMaj9bO2HjdBJZxq5YwkDBusV6E0T +NbLBfYb5teq2XyH632X6Zj+AUlkk8k37KnY8kxl+ccHkhClXjwYZIiXggUYuIM2E +J0MZ9EA+Db6WKrgrpLLMBiTTwZIRp8J9hrbo7a9WZ2iz+X/A0qWxVzB3vdpBX73z +NRAcf57uk6VdWmQsSFhiCSiC1gPvakJ5rQQvgcQdB0PkpFNv20ncZCyqCyjl23zg +6VUU6hjRRuZC6zlQ4bOasANIHZ1i6Ri17eHyisKoid0lSk3RXpL+XEBrpo/gZ80q +/aQa39F8TSyPborks368BFqT3z6z9CjuErynpZTDbGBGPx1hNOmkLGccExY9oI6g +7RBMyGdllkruN+Me7O/3gEdhMwLoOZX54zJyiL9IWMITjr9DCyjTAN58g/hw1k3s +bMQeCzSJ3qm8sgqh4+9392ILbDZQqugaVRq5enVEp4EedZhKDm0OMDHkz4yos/sf +FvHGJ9IJV7KNPgtKbIufVmElGstUEO75sAbJXKKf9RDF3mS3l10fW5PzUhd7QoPk +bctnq2G1Fuc4XdZj51mxj/d3NE+guQENBDgbNloQBACMDd+3MOnocx85heT7zsiL +wQznw0dA554+XKh7HNjpQOGaCtIgKbvXi56K1jblx5NVyaV1VmGL9woCUfG5lGME +uJE0PbL4XlMEj1txa2yJQFQcNAiICrRfQgqQE1LZMht0fpXvwmbxdTqubsG2382V +jXtGVrAv0l3jYIGWSTo+QwADBQP+JVwIi8Qv0AzMEhMcYovMVoidMGvSCtLoIeOQ +J9KuQuKkoUhoW27oEJlYYC8XqEJ3sIQnYmc7fGaMjt+/QVr5Pq/g9iG5JTgWWCJe +8zy/+upwzE0EN6W6TqKXOBsDsENMGIok58d59z7ykI3VQRmu7TfTM1QJHVImyALj +7F0mph6IRgQYEQIABgUCOBs2WgAKCRCWJIPhVmLHNIEGAKCWcOaIYvLspRW11j2b +qlFfyUDwnQCfTTs8DO0AFWVdMrwydOYSow2cI5o= +=CfD6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/test/testsources.list/sources.list.all-gpg-broken b/test/testsources.list/sources.list.all-gpg-broken new file mode 100644 index 0000000..110f318 --- /dev/null +++ b/test/testsources.list/sources.list.all-gpg-broken @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-broken/ / + diff --git a/test/testsources.list/sources.list.all-gpg-ok b/test/testsources.list/sources.list.all-gpg-ok new file mode 100644 index 0000000..2e9a445 --- /dev/null +++ b/test/testsources.list/sources.list.all-gpg-ok @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ / + diff --git a/test/testsources.list/sources.list.all-release-broken b/test/testsources.list/sources.list.all-release-broken new file mode 100644 index 0000000..5e13832 --- /dev/null +++ b/test/testsources.list/sources.list.all-release-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-broken/ / diff --git a/test/testsources.list/sources.list.all-release-ok b/test/testsources.list/sources.list.all-release-ok new file mode 100644 index 0000000..8bcceee --- /dev/null +++ b/test/testsources.list/sources.list.all-release-ok @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-ok/ / diff --git a/test/testsources.list/sources.list.md5-package-broken b/test/testsources.list/sources.list.md5-package-broken new file mode 100644 index 0000000..3ba4318 --- /dev/null +++ b/test/testsources.list/sources.list.md5-package-broken @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-broken/ / + diff --git a/test/testsources.list/sources.list.md5-package-ok b/test/testsources.list/sources.list.md5-package-ok new file mode 100644 index 0000000..9bf2077 --- /dev/null +++ b/test/testsources.list/sources.list.md5-package-ok @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-ok/ / + diff --git a/test/testsources.list/sources.list.md5-release-broken b/test/testsources.list/sources.list.md5-release-broken new file mode 100644 index 0000000..1c8f1dd --- /dev/null +++ b/test/testsources.list/sources.list.md5-release-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-broken/ / diff --git a/test/testsources.list/sources.list.md5-release-ok b/test/testsources.list/sources.list.md5-release-ok new file mode 100644 index 0000000..f27e04f --- /dev/null +++ b/test/testsources.list/sources.list.md5-release-ok @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-ok/ / diff --git a/test/testsources.list/sources.list.sha1-release-broken b/test/testsources.list/sources.list.sha1-release-broken new file mode 100644 index 0000000..29a2778 --- /dev/null +++ b/test/testsources.list/sources.list.sha1-release-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-broken/ / diff --git a/test/testsources.list/sources.list.sha1-release-ok b/test/testsources.list/sources.list.sha1-release-ok new file mode 100644 index 0000000..6f95d02 --- /dev/null +++ b/test/testsources.list/sources.list.sha1-release-ok @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-ok/ / diff --git a/test/testsources.list/sources.list.sha256-package-broken b/test/testsources.list/sources.list.sha256-package-broken new file mode 100644 index 0000000..d6d284b --- /dev/null +++ b/test/testsources.list/sources.list.sha256-package-broken @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-broken/ / + diff --git a/test/testsources.list/sources.list.sha256-package-ok b/test/testsources.list/sources.list.sha256-package-ok new file mode 100644 index 0000000..c2d7570 --- /dev/null +++ b/test/testsources.list/sources.list.sha256-package-ok @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-ok/ / + diff --git a/test/testsources.list/sources.list.sha256-release-broken b/test/testsources.list/sources.list.sha256-release-broken new file mode 100644 index 0000000..713a4d9 --- /dev/null +++ b/test/testsources.list/sources.list.sha256-release-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-broken/ / diff --git a/test/testsources.list/sources.list.sha256-release-ok b/test/testsources.list/sources.list.sha256-release-ok new file mode 100644 index 0000000..93b44e3 --- /dev/null +++ b/test/testsources.list/sources.list.sha256-release-ok @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-ok/ / -- 2.45.2